Backout 0284b1ff46c6, for NullPointerException
authorMark Finkle <mfinkle@mozilla.com>
Tue, 03 Jan 2012 02:18:39 -0500
changeset 83655 1d00e560e0dc39ddec224cc8cf3f5e2484c29eed
parent 83654 172f007cc17cf9ae1c2c27656e992b88dfdc4f1b
child 83656 f33f32134b89c3c5b3c3356601537140e0f41f17
push id4525
push usermfinkle@mozilla.com
push dateTue, 03 Jan 2012 07:19:56 +0000
treeherdermozilla-inbound@1d00e560e0dc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone12.0a1
backs out0284b1ff46c6c7decbc14d1492be1964a8580af1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout 0284b1ff46c6, for NullPointerException
mobile/android/base/GeckoApp.java
mobile/android/base/GeckoAppShell.java
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -607,18 +607,18 @@ abstract public class GeckoApp
 
                 HistoryEntry lastHistoryEntry = tab.getLastHistoryEntry();
                 if (lastHistoryEntry == null)
                     return;
 
                 if (getLayerController().getLayerClient() != mSoftwareLayerClient)
                     return;
 
-                if (mLastUri.equals(lastHistoryEntry.mUri) &&
-                    mLastTitle.equals(lastHistoryEntry.mTitle))
+                if (mLastUri == lastHistoryEntry.mUri &&
+                    mLastTitle == lastHistoryEntry.mTitle)
                     return;
    
                 mLastViewport = mSoftwareLayerClient.getGeckoViewportMetrics().toJSON();
                 mLastUri = lastHistoryEntry.mUri;
                 mLastTitle = lastHistoryEntry.mTitle;
                 Bitmap bitmap = mSoftwareLayerClient.getBitmap();
                 if (bitmap != null) {
                     ByteArrayOutputStream bos = new ByteArrayOutputStream();
--- a/mobile/android/base/GeckoAppShell.java
+++ b/mobile/android/base/GeckoAppShell.java
@@ -870,17 +870,17 @@ public class GeckoAppShell
                         text = cm.getText().toString();
                 }
                 try {
                     sClipboardQueue.put(text != null ? text : EMPTY_STRING);
                 } catch (InterruptedException ie) {}
             }});
         try {
             String ret = sClipboardQueue.take();
-            return (ret.equals(EMPTY_STRING) ? null : ret);
+            return (ret == EMPTY_STRING ? null : ret);
         } catch (InterruptedException ie) {}
         return null;
     }
 
     static void setClipboardText(final String text) {
         getHandler().post(new Runnable() { 
             @SuppressWarnings("deprecation")
             public void run() {