ode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mr...@apache.org
Subject svn commit: r588080 - in /ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine: BpelProcess.java Messages.java
Date Wed, 24 Oct 2007 23:25:30 GMT
Author: mriou
Date: Wed Oct 24 16:25:29 2007
New Revision: 588080

URL: http://svn.apache.org/viewvc?rev=588080&view=rev
Log:
ODE-203 Shouldn't complain when a initializePartnerLink=false isn't declared in deploy.xml.

Modified:
    ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
    ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Messages.java

Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java?rev=588080&r1=588079&r2=588080&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java Wed Oct
24 16:25:29 2007
@@ -621,7 +621,7 @@
         for (OPartnerLink pl : oprocess.getAllPartnerLinks()) {
             if (pl.hasMyRole()) {
                 Endpoint endpoint = myRoleEndpoints.get(pl);
-                if (endpoint == null)
+                if (endpoint == null && pl.initializePartnerRole)
                     throw new IllegalArgumentException("No service name for myRole plink
" + pl.getName());
                 PartnerLinkMyRoleImpl myRole = new PartnerLinkMyRoleImpl(this, pl, endpoint);
                 _myRoles.put(pl, myRole);
@@ -1203,17 +1203,19 @@
 
             if (!_hydratedOnce) {
                 for (PartnerLinkPartnerRoleImpl prole : _partnerRoles.values()) {
-                    PartnerRoleChannel channel = _contexts.bindingContext.createPartnerRoleChannel(_pid,
-                            prole._plinkDef.partnerRolePortType, prole._initialPartner);
-                    prole._channel = channel;
-                    _partnerChannels.put(prole._initialPartner, prole._channel);
-                    EndpointReference epr = channel.getInitialEndpointReference();
-                    if (epr != null) {
-                        prole._initialEPR = epr;
-                        _partnerEprs.put(prole._initialPartner, epr);
+                    if (prole._initialPartner != null) {
+                        PartnerRoleChannel channel = _contexts.bindingContext.createPartnerRoleChannel(_pid,
+                                prole._plinkDef.partnerRolePortType, prole._initialPartner);
+                        prole._channel = channel;
+                        _partnerChannels.put(prole._initialPartner, prole._channel);
+                        EndpointReference epr = channel.getInitialEndpointReference();
+                        if (epr != null) {
+                            prole._initialEPR = epr;
+                            _partnerEprs.put(prole._initialPartner, epr);
+                        }
+                        __log.debug("Activated " + _pid + " partnerrole " + prole.getPartnerLinkName()
+ ": EPR is "
+                                + prole._initialEPR);
                     }
-                    __log.debug("Activated " + _pid + " partnerrole " + prole.getPartnerLinkName()
+ ": EPR is "
-                            + prole._initialEPR);
                 }
                 _hydratedOnce = true;
             }

Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Messages.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Messages.java?rev=588080&r1=588079&r2=588080&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Messages.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Messages.java Wed Oct
24 16:25:29 2007
@@ -55,10 +55,14 @@
         return format("Unkown EPR: {0}", epr);
     }
 
-    String msgProcessUnregistered(QName process) {
-        return format("Process {0} has been unregistered.", process);
+    String msgProcessRegistered(QName pid) {
+        return format("Registered process {0}.", pid);
     }
 
+    String msgProcessUnregistered(QName pid) {
+        return format("Unregistered process {0}.", pid);
+    }
+    
     String msgProcessUnregisterFailed(QName process) {
         return format("Failed to unregister process {0}! Check database for consistency!",
process);
     }
@@ -130,10 +134,6 @@
 
     String msgOperationInterrupted() {
         return format("Operation was interrupted.");
-    }
-
-    String msgProcessRegistered(QName pid) {
-        return format("Activated process {0}.", pid);
     }
 
     String msgServerStarted() {



Mime
View raw message