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 dm...@apache.org on 2007/05/09 11:31:24 UTC
svn commit: r536491 -
/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java
Author: dmiddlem
Date: Wed May 9 04:31:23 2007
New Revision: 536491
URL: http://svn.apache.org/viewvc?view=rev&rev=536491
Log:
Commit for YOKO-366:
* Removed some extra processing in object reference support that is only used as a helper.
Modified:
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java?view=diff&rev=536491&r1=536490&r2=536491
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java Wed May 9 04:31:23 2007
@@ -1409,8 +1409,8 @@
}
org.omg.CORBA.Object ref = CorbaUtils.importObjectReference(orb, address);
- ref = CorbaObjectReferenceHelper.addYokoProfileToReference(orb, ref, address, endpointName,
- interfaceName, serviceName);
+ //ref = CorbaObjectReferenceHelper.addYokoProfileToReference(orb, ref, address, endpointName,
+ // interfaceName, serviceName);
obj.setReference(ref);
}
} catch (java.lang.Exception ex) {
@@ -1438,18 +1438,18 @@
}
// Define buffers to use when getting information from the Yoko profile
- StringBuffer addr = new StringBuffer();
- StringBuffer epName = new StringBuffer();
- StringBuffer intfName = new StringBuffer();
- StringBuffer svcName = new StringBuffer();
+ //StringBuffer addr = new StringBuffer();
+ //StringBuffer epName = new StringBuffer();
+ //StringBuffer intfName = new StringBuffer();
+ //StringBuffer svcName = new StringBuffer();
- CorbaObjectReferenceHelper.getYokoProfileInformation(orb, corbaObject, addr,
- epName, intfName, svcName);
+ //CorbaObjectReferenceHelper.getYokoProfileInformation(orb, corbaObject, addr,
+ // epName, intfName, svcName);
// Use the IOR as the address if one does not exist in the Yoko profile
- if (addr.length() == 0) {
- addr.append(orb.object_to_string(corbaObject));
- }
+ //if (addr.length() == 0) {
+ // addr.append(orb.object_to_string(corbaObject));
+ //}
// We need to access the WSDL to find the information to build the metadata for the
// endpoint reference type we are about to create.
@@ -1459,26 +1459,20 @@
QName bindingName = refObject.getBinding();
Binding wsdlBinding = getObjectReferenceBinding(wsdlDef, bindingName, corbaObject);
- String endpointName = epName.toString();
- QName interfaceName = QName.valueOf(intfName.toString());
- QName serviceName = QName.valueOf(svcName.toString());
+ String address = orb.object_to_string(corbaObject);
+
+ String endpointName = null;
+ QName interfaceName = null;
+ QName serviceName = null;
QName referenceName = null;
// Fill in any missing information that we were unable to get from the Yoko profile using
// information from the wsdl definition.
if (wsdlBinding != null) {
- if (endpointName.length() == 0) {
- endpointName = CorbaObjectReferenceHelper.getEndpointName(wsdlBinding, wsdlDef);
- }
-
- if (interfaceName.getLocalPart().length() == 0) {
- interfaceName = wsdlBinding.getPortType().getQName();
- }
-
- if (serviceName.getLocalPart().length() == 0) {
- serviceName = CorbaObjectReferenceHelper.getServiceName(wsdlBinding, wsdlDef);
- }
-
+ // NOTE: Removed checking the StringBuffers for now.
+ endpointName = CorbaObjectReferenceHelper.getEndpointName(wsdlBinding, wsdlDef);
+ interfaceName = wsdlBinding.getPortType().getQName();
+ serviceName = CorbaObjectReferenceHelper.getServiceName(wsdlBinding, wsdlDef);
referenceName = new QName(interfaceName.getLocalPart() + "Ref");
} else {
referenceName = new QName("CORBA.Object");
@@ -1490,7 +1484,8 @@
// Add the Address information
QName addrQName = new QName(CorbaObjectReferenceHelper.ADDRESSING_NAMESPACE_URI, "Address");
writer.add(factory.createStartElement(addrQName, null, null));
- writer.add(factory.createCharacters(addr.toString()));
+ //writer.add(factory.createCharacters(addr.toString()));
+ writer.add(factory.createCharacters(address));
writer.add(factory.createEndElement(addrQName, null));
if (wsdlBinding != null) {