Revision: 6516 Author: [email protected] Date: Wed Oct 28 11:49:34 2009 Log: tr...@6515 was merged into this branch Bugfix in JavaToJavaScriptCompiler where it assumes PropertyOracle#getSelectionProperty can return null svn merge --ignore-ancestry -c 6515 http://google-web-toolkit.googlecode.com/svn/trunk/ .
Patch by: jlabanca http://code.google.com/p/google-web-toolkit/source/detail?r=6516 Modified: /releases/2.0/branch-info.txt /releases/2.0/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java ======================================= --- /releases/2.0/branch-info.txt Wed Oct 28 08:49:46 2009 +++ /releases/2.0/branch-info.txt Wed Oct 28 11:49:34 2009 @@ -81,3 +81,7 @@ Improve performance of ClientBundle code generation svn merge --ignore-ancestry -c 6504,6505,6506 https://google-web-toolkit.googlecode.com/svn/trunk . +tr...@6515 was merged into this branch + Bugfix in JavaToJavaScriptCompiler where it assumes PropertyOracle#getSelectionProperty can return null + svn merge --ignore-ancestry -c 6515 http://google-web-toolkit.googlecode.com/svn/trunk/ . + ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java Fri Oct 16 14:04:54 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java Wed Oct 28 11:49:34 2009 @@ -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; @@ -328,8 +329,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; } } --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
