[riftsaw-commits] riftsaw SVN: r1215 - in dsp/trunk: samples/deployer-assembly/src/main/resources/WEB-INF/classes and 1 other directory.
Author: objectiser
Date: 2011-01-07 06:22:16 -0500 (Fri, 07 Jan 2011)
New Revision: 1215
Modified:
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java
dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/classes/dsp.properties
Log:
Fixed npe when no build processor provided (in jboss environment).
Modified: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java
===================================================================
--- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java 2011-01-06
16:36:58 UTC (rev 1214)
+++ dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java 2011-01-07
11:22:16 UTC (rev 1215)
@@ -134,7 +134,9 @@
}
public DeploymentBuilder process(BuildProcessor processor) {
- processor.process(this);
+ if (processor != null) {
+ processor.process(this);
+ }
return(this);
}
Modified:
dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/classes/dsp.properties
===================================================================
---
dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/classes/dsp.properties 2011-01-06
16:36:58 UTC (rev 1214)
+++
dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/classes/dsp.properties 2011-01-07
11:22:16 UTC (rev 1215)
@@ -1,5 +1,5 @@
-dsp.server.config.locator = org.jboss.soa.dsp.server.tomcat.TomcatServerConfigLocator
-dsp.service.deployer = org.jboss.soa.dsp.deployer.tomcat.TomcatServiceDeployer
+#dsp.server.config.locator = org.jboss.soa.dsp.server.tomcat.TomcatServerConfigLocator
+#dsp.service.deployer = org.jboss.soa.dsp.deployer.tomcat.TomcatServiceDeployer
-#dsp.server.config.locator = org.jboss.soa.dsp.server.jboss.ServerConfigFactory
-#dsp.service.deployer = org.jboss.soa.dsp.deployer.jboss.JBossServiceDeployer
+dsp.server.config.locator = org.jboss.soa.dsp.server.jboss.ServerConfigFactory
+dsp.service.deployer = org.jboss.soa.dsp.deployer.jboss.JBossServiceDeployer