svn commit: r372796 - in /webservices/sandesha/trunk/src/org/apache/sandesha2: SandeshaModule.java handlers/SandeshaInHandler.java util/RMPolicyManager.java util/SandeshaUtil.java

[chamikara]

Author: chamikara
Date: Fri Jan 27 01:42:17 2006
New Revision: 372796

URL: http://svn.apache.org/viewcvs?rev=372796&view=rev
Log:
Some bug fixes

Modified:
    webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java
    
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
    
webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMPolicyManager.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java

Modified: 
webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java?rev=372796&r1=372795&r2=372796&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java 
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java Fri 
Jan 27 01:42:17 2006
@@ -21,6 +21,8 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.AxisDescription;
 import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.ParameterImpl;
 import org.apache.axis2.engine.AxisConfiguration;
@@ -56,7 +58,7 @@
        public void engageNotify(AxisDescription axisDescription) throws 
AxisFault {
 
                // TODO add notify logic.
-               
+                               
                SandeshaPropertyBean defaultPropertyBean = 
PropertyManager.getInstance().getPropertyBean();
                SandeshaPropertyBean axisDescPropertyBean = 
RMPolicyManager.loadPoliciesFromAxisDescription(axisDescription);
                
@@ -69,7 +71,6 @@
                }
                
                axisDescription.addParameter(parameter);
-
        }
 
        private void continueUncompletedSequences(StorageManager storageManager,

Modified: 
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java?rev=372796&r1=372795&r2=372796&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
 (original)
+++ 
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
 Fri Jan 27 01:42:17 2006
@@ -93,7 +93,7 @@
                                .getMessageProcessor(rmMsgCtx.getMessageType());
 
                if (msgProcessor == null) {
-                       String message = "Cant find a suitable message 
processor";
+                       String message = "An Invalid RM message was received. 
Sandesha2 cant forward this request";
                        log.debug(message);
                        throw new AxisFault(message);
                }

Modified: 
webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMPolicyManager.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMPolicyManager.java?rev=372796&r1=372795&r2=372796&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMPolicyManager.java 
(original)
+++ 
webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMPolicyManager.java 
Fri Jan 27 01:42:17 2006
@@ -48,8 +48,10 @@
                
                SandeshaPropertyBean propertyBean = new SandeshaPropertyBean ();
                
-               Policy policy = desc.getPolicyInclude().getEffectivePolicy();
+               Policy policy = null;
+               policy = desc.getPolicyInclude().getEffectivePolicy();
 
+               
                if (policy == null) {
                        //no policy found
                        return null;

Modified: 
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java?rev=372796&r1=372795&r2=372796&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java 
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java 
Fri Jan 27 01:42:17 2006
@@ -447,6 +447,10 @@
                SOAPHeader header = null;
                if (env != null)
                        header = env.getHeader();
+               else {
+                       log.error("SOAP envelope is null");
+                       return false;
+               }
 
                OMElement sequenceElem = null;
                if (header != null)



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]