geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yunfen...@apache.org
Subject svn commit: r682595 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/MarshallerListener.java
Date Tue, 05 Aug 2008 06:30:43 GMT
Author: yunfengma
Date: Mon Aug  4 23:30:43 2008
New Revision: 682595

URL: http://svn.apache.org/viewvc?rev=682595&view=rev
Log:
GERONIMODEVTOOLS-458 NullPointerException when creating new geronimo-web.xml

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/MarshallerListener.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/MarshallerListener.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/MarshallerListener.java?rev=682595&r1=682594&r2=682595&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/MarshallerListener.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/MarshallerListener.java
Mon Aug  4 23:30:43 2008
@@ -35,7 +35,7 @@
 		} else if (source instanceof WebApp) {
             WebApp webapp = (WebApp)source;
             GbeanLocator gbeanlocator = webapp.getWebContainer();
-            if (isEmpty(gbeanlocator.getGbeanLink()) && isEmpty(gbeanlocator.getPattern()))
{
+            if (gbeanlocator != null && isEmpty(gbeanlocator.getGbeanLink()) &&
isEmpty(gbeanlocator.getPattern())) {
                 webapp.setWebContainer(null);
             }
         }



Mime
View raw message