Author: midon
Date: Thu Apr 16 01:53:02 2009
New Revision: 765449
URL: http://svn.apache.org/viewvc?rev=765449&view=rev
Log:
avoid NPE when service is null
Modified:
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java
Modified:
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java
URL:
http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java?rev=765449&r1=765448&r2=765449&view=diff
==============================================================================
---
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java
(original)
+++
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java
Thu Apr 16 01:53:02 2009
@@ -73,16 +73,17 @@
AxisConfiguration registry =
messageContext.getConfigurationContext().getAxisConfiguration();
AxisService service = registry.getService(path);
- if (log.isDebugEnabled()) log.debug("Found service in registry
from name " + path + ": " + service);
+ if (service != null) {
+ if (log.isDebugEnabled()) log.debug("Found service in
registry from name " + path + ": " + service);
- // Axis2 >1.3 is less clever than 1.3. See ODE-509
- // We have to do additional work for him.
- Policy policy = PolicyUtil.getMergedPolicy(new
ArrayList(service.getPolicySubject().getAttachedPolicyComponents()), service);
- if (policy != null) {
- if (log.isDebugEnabled()) log.debug("Apply policy: " +
policy.getName());
-
messageContext.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+ // Axis2 >1.3 is less clever than 1.3. See ODE-509
+ // We have to do additional work for him.
+ Policy policy = PolicyUtil.getMergedPolicy(new
ArrayList(service.getPolicySubject().getAttachedPolicyComponents()), service);
+ if (policy != null) {
+ if (log.isDebugEnabled()) log.debug("Apply policy: " +
policy.getName());
+
messageContext.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+ }
}
-
return service;
}
}
