svn commit: r350195 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2: client/MEPClient.java context/AbstractContext.java

[ch...@apache.org]

Author: chinthaka
Date: Wed Nov 30 23:08:22 2005
New Revision: 350195

URL: http://svn.apache.org/viewcvs?rev=350195&view=rev
Log:
checking correct options in the client options.

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java?rev=350195&r1=350194&r2=350195&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java Wed Nov 30 23:08:22 2005
@@ -65,7 +65,10 @@
     protected void prepareInvocation(AxisOperation axisop, MessageContext msgCtx)
             throws AxisFault {
 
-        if (clientOptions == null) {
+        // user must provide the minimum information for the engine to proceed with the invocation.
+        // For the time being, I think he should at least provide the toEPR. So I should check that is
+        // available either from the message context or from the options.
+        if ( (msgCtx == null || msgCtx.getTo() == null) && (clientOptions == null || clientOptions.getTo() == null ) ) {
             throw new AxisFault("Can not proceed without options being set for invocation. Set the" +
                     "properties for this invocation via MEPClient.setOptions(Options) first.");
         }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java?rev=350195&r1=350194&r2=350195&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java Wed Nov 30 23:08:22 2005
@@ -84,15 +84,15 @@
         return properties;
     }
 
-//    /**
-//     * This will set the properties to the context. But in setting that one may need to "copy" all
-//     * the properties from the source properties to the target properties. To enable this we introduced
-//     * a property (org.apache.axis2.client.Options#COPY_PROPERTIES) so that if set to true, this code
-//     * will copy the whole thing, without just referencing to the source.
-//     *
-//     * @param properties
-//     * @see org.apache.axis2.client.Options#COPY_PROPERTIES
-//     */
+    /**
+     * This will set the properties to the context. But in setting that one may need to "copy" all
+     * the properties from the source properties to the target properties. To enable this we introduced
+     * a property (org.apache.axis2.client.Options#COPY_PROPERTIES) so that if set to true, this code
+     * will copy the whole thing, without just referencing to the source.
+     *
+     * @param properties
+     * @see org.apache.axis2.client.Options#COPY_PROPERTIES
+     */
 
     public void setProperties(Map properties) {
         if (properties == null) {