diff options
| author | Grant Gayed <ggayed> | 2011-02-22 21:29:30 +0000 |
|---|---|---|
| committer | Grant Gayed <ggayed> | 2011-02-22 21:29:30 +0000 |
| commit | 87330b10800601c0b12e6edda61ce1010ad6b657 (patch) | |
| tree | 67094cf2096261de566e6c446ea47dd37fb0105e | |
| parent | 13ea970dfe1def04655e6d095006ba7bba22d634 (diff) | |
| download | eclipse.platform.swt-87330b10800601c0b12e6edda61ce1010ad6b657.tar.gz eclipse.platform.swt-87330b10800601c0b12e6edda61ce1010ad6b657.tar.xz eclipse.platform.swt-87330b10800601c0b12e6edda61ce1010ad6b657.zip | |
335373 - NPE when changing iFrame url via SWT browser evaluate() method
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java index a2929c7284..1c6d79353e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java @@ -3098,7 +3098,9 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF Enumeration elements = functions.elements (); while (elements.hasMoreElements ()) { BrowserFunction function = (BrowserFunction)elements.nextElement (); - execute (function.functionString); + if (!function.isEvaluate) { + execute (function.functionString); + } } } @@ -3292,7 +3294,9 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF Enumeration elements = functions.elements (); while (elements.hasMoreElements ()) { BrowserFunction function = (BrowserFunction)elements.nextElement (); - execute (function.functionString); + if (!function.isEvaluate) { + execute (function.functionString); + } } /* * For Mozilla >= 1.9.2, when content is being set via nsIWebBrowserStream, |