You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by br...@apache.org on 2007/05/10 11:26:19 UTC
svn commit: r536827 - in
/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors:
CorbaInInterceptor.java CorbaOutInterceptor.java
Author: bravi
Date: Thu May 10 04:26:18 2007
New Revision: 536827
URL: http://svn.apache.org/viewvc?view=rev&rev=536827
Log:
Fix for the continuum failures in the bindings module.
Modified:
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptor.java
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptor.java
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptor.java?view=diff&rev=536827&r1=536826&r2=536827
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptor.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptor.java Thu May 10 04:26:18 2007
@@ -110,6 +110,9 @@
CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
}
}
+ if (corbaStaxObject == null) {
+ corbaStaxObject = new CorbaStaxObject();
+ }
corbaStaxObject.setTypeMaps(typeMaps);
corbaStaxObject.setServiceInfo(service);
@@ -138,11 +141,7 @@
Exchange exchange = message.getExchange();
orb = (ORB)exchange.get(ORB.class);
- if (corbaStaxObject != null) {
- corbaStaxObject.setOrb(orb);
- } else {
- corbaStaxObject = new CorbaStaxObject(orb);
- }
+ corbaStaxObject.setOrb(orb);
String opName = message.getExchange().get(String.class);
Iterator i = bInfo.getOperations().iterator();
@@ -180,11 +179,7 @@
OperationType opType = null;
orb = (org.omg.CORBA.ORB) message.getExchange().get(org.omg.CORBA.ORB.class);
- if (corbaStaxObject != null) {
- corbaStaxObject.setOrb(orb);
- } else {
- corbaStaxObject = new CorbaStaxObject(orb);
- }
+ corbaStaxObject.setOrb(orb);
if (message.getStreamableException() != null || message.getSystemException() != null) {
Endpoint ep = message.getExchange().get(Endpoint.class);
message.getInterceptorChain().abort();
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptor.java?view=diff&rev=536827&r1=536826&r2=536827
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptor.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptor.java Thu May 10 04:26:18 2007
@@ -102,6 +102,9 @@
CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
}
}
+ if (corbaStaxObject == null) {
+ corbaStaxObject = new CorbaStaxObject();
+ }
corbaStaxObject.setTypeMaps(typeMaps);
corbaStaxObject.setServiceInfo(service);