You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2011/03/17 03:45:36 UTC
svn commit: r1082378 -
/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java
Author: genspring
Date: Thu Mar 17 02:45:36 2011
New Revision: 1082378
URL: http://svn.apache.org/viewvc?rev=1082378&view=rev
Log:
Fix NPE when deploying a non jaxrpc ejb module.
Modified:
geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java?rev=1082378&r1=1082377&r2=1082378&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java Thu Mar 17 02:45:36 2011
@@ -198,13 +198,20 @@ public class AxisBuilder implements WebS
@Override
public boolean configureEJB(GBeanData targetGBean, String ejbName, Module module, Map sharedContext, Bundle bundle) throws DeploymentException {
+
+ if (sharedContext.get(KEY) == null){
+ return false;
+ }
+
Map portInfoMap = (Map) sharedContext.get(KEY);
- PortInfo portInfo = (PortInfo) portInfoMap.get(ejbName);
- if (portInfo == null) {
+
+ if (portInfoMap.get(ejbName) == null) {
//not ours
return false;
}
+ PortInfo portInfo = (PortInfo) portInfoMap.get(ejbName);
+
String beanClassName = (String)targetGBean.getAttribute("ejbClass");
Class serviceClass = loadClass(beanClassName, bundle);
if (isJAXWSWebService(serviceClass)) {