You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/07/16 00:38:39 UTC

svn commit: r964633 - in /geronimo/server/trunk/plugins/jetty8: geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java pom.xml

Author: djencks
Date: Thu Jul 15 22:38:39 2010
New Revision: 964633

URL: http://svn.apache.org/viewvc?rev=964633&view=rev
Log:
Fix compilation error.  jetty 8.0.0.M1 has a NPE bug, so go to M2-SNAPSHOT

Modified:
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java
    geronimo/server/trunk/plugins/jetty8/pom.xml

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java?rev=964633&r1=964632&r2=964633&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java Thu Jul 15 22:38:39 2010
@@ -226,7 +226,9 @@ public class WebAppContextWrapper implem
 
         //stuff from spec dd
         setDisplayName(displayName);
-        webAppContext.setInitParams(contextParamMap);
+        if (contextParamMap != null) {
+            webAppContext.getInitParams().putAll(contextParamMap);
+        }
         setListenerClassNames(listenerClassNames);
         webAppContext.setDistributable(distributable);
         webAppContext.setWelcomeFiles(welcomeFiles);

Modified: geronimo/server/trunk/plugins/jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/pom.xml?rev=964633&r1=964632&r2=964633&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/pom.xml Thu Jul 15 22:38:39 2010
@@ -34,7 +34,7 @@
     </description>
 
     <properties>
-        <jettyVersion>8.0.0.M1</jettyVersion>
+        <jettyVersion>8.0.0.M2-SNAPSHOT</jettyVersion>
     </properties>
 
     <dependencyManagement>