Revision: 7204 Author: [email protected] Date: Mon Nov 30 13:49:19 2009 Log: tr...@7201,7202 was merged into this branch Don't validate servlet tags with -noserver. svn merge --ignore-ancestry -c7201 https://google-web-toolkit.googlecode.com/svn/trunk . svn merge --ignore-ancestry -c7202 https://google-web-toolkit.googlecode.com/svn/trunk .
http://code.google.com/p/google-web-toolkit/source/detail?r=7204 Modified: /releases/2.0/branch-info.txt /releases/2.0/dev/core/src/com/google/gwt/dev/DevMode.java /releases/2.0/dev/core/src/com/google/gwt/dev/jjs/InternalCompilerException.java /releases/2.0/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java /releases/2.0/dev/core/src/com/google/gwt/dev/js/ast/JsVisitor.java ======================================= --- /releases/2.0/branch-info.txt Mon Nov 30 07:55:10 2009 +++ /releases/2.0/branch-info.txt Mon Nov 30 13:49:19 2009 @@ -1107,3 +1107,7 @@ Update location of missing plugin app svn merge --ignore-ancestry -c7198 https://google-web-toolkit.googlecode.com/svn/trunk . +tr...@7201,7202 was merged into this branch + Don't validate servlet tags with -noserver. + svn merge --ignore-ancestry -c7201 https://google-web-toolkit.googlecode.com/svn/trunk . + svn merge --ignore-ancestry -c7202 https://google-web-toolkit.googlecode.com/svn/trunk . ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/DevMode.java Mon Nov 23 21:23:36 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/DevMode.java Mon Nov 30 13:49:19 2009 @@ -328,7 +328,7 @@ ServletValidator servletValidator = null; File webXml = new File(options.getWarDir(), "WEB-INF/web.xml"); - if (webXml.exists()) { + if (!options.isNoServer() && webXml.exists()) { servletValidator = ServletValidator.create(getTopLogger(), webXml); } @@ -342,7 +342,9 @@ // actually load the module from the browser. startupModules.put(module.getName(), module); Util.recursiveDelete(options.getShellBaseWorkDir(module), false); - validateServletTags(moduleBranch, servletValidator, module, webXml); + if (!options.isNoServer()) { + validateServletTags(moduleBranch, servletValidator, module, webXml); + } TreeLogger loadLogger = moduleBranch.branch(TreeLogger.DEBUG, "Bootstrap link for command-line module '" + moduleName + "'"); link(loadLogger, module); @@ -405,10 +407,10 @@ // Look for launchable files directly under war File warDir = options.getWarDir(); for (File htmlFile : warDir.listFiles(new FilenameFilter() { - public boolean accept(File dir, String name) { - return STARTUP_FILE_PATTERN.matcher(name).matches(); - } - })) { + public boolean accept(File dir, String name) { + return STARTUP_FILE_PATTERN.matcher(name).matches(); + } + })) { options.addStartupURL(htmlFile.getName()); } } ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/jjs/InternalCompilerException.java Wed Oct 24 23:02:55 2007 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/jjs/InternalCompilerException.java Mon Nov 30 13:49:19 2009 @@ -66,6 +66,15 @@ * Tracks if there's a pending addNode() to avoid recursion sickness. */ private static final ThreadLocal<InternalCompilerException> pendingICE = new ThreadLocal<InternalCompilerException>(); + + /** + * Force this class to be preloaded. If we don't preload this class, we can + * get into bad behavior if we later try to load this class under out of + * memory or out of stack conditions. + */ + public static void preload() { + // Nothing to do, JVM will initialize this class on static invocation. + } private final List<NodeInfo> nodeTrace = new ArrayList<NodeInfo>(); ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java Mon Nov 23 09:21:44 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java Mon Nov 30 13:49:19 2009 @@ -392,6 +392,8 @@ String[] additionalRootTypes, JJSOptions options, boolean singlePermutation) throws UnableToCompleteException { + InternalCompilerException.preload(); + if (additionalRootTypes == null) { additionalRootTypes = Empty.STRINGS; } ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/js/ast/JsVisitor.java Wed Nov 4 06:59:39 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/js/ast/JsVisitor.java Mon Nov 30 13:49:19 2009 @@ -458,9 +458,6 @@ InternalCompilerException ice; if (e instanceof InternalCompilerException) { ice = (InternalCompilerException) e; - } else if (e instanceof OutOfMemoryError) { - // Just rethrow, it's not our problem. - throw (OutOfMemoryError) e; } else { ice = new InternalCompilerException("Unexpected error during visit.", e); } -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
