Fixes a bug where JavaToJavaScriptCompiler assumes PropertyOracle#getSelectionProperty will return null if a property is not defined, but it actually throws a BadPropertyException.
Patch by: jlabanca
Review by: spoon
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6515 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
index 93c4a11..58ee760 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
@@ -15,6 +15,7 @@
*/
package com.google.gwt.dev.jjs;
+import com.google.gwt.core.ext.BadPropertyValueException;
import com.google.gwt.core.ext.PropertyOracle;
import com.google.gwt.core.ext.SelectionProperty;
import com.google.gwt.core.ext.TreeLogger;
@@ -334,8 +335,9 @@
// blocks, this class now handles non-top level blocks only.
SelectionProperty userAgentProperty = null;
for (PropertyOracle oracle : propertyOracles) {
- userAgentProperty = oracle.getSelectionProperty(logger, "user.agent");
- if (userAgentProperty != null) {
+ try {
+ userAgentProperty = oracle.getSelectionProperty(logger, "user.agent");
+ } catch (BadPropertyValueException e) {
break;
}
}