You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/03/12 19:34:54 UTC
svn commit: r517321 -
/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java
Author: rfeng
Date: Mon Mar 12 11:34:53 2007
New Revision: 517321
URL: http://svn.apache.org/viewvc?view=rev&rev=517321
Log:
[sca-integration-branch] The HelperContext was looked up by a wrong key
Modified:
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java
Modified: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java?view=diff&rev=517321&r1=517320&r2=517321
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java Mon Mar 12 11:34:53 2007
@@ -48,16 +48,16 @@
HelperContext helperContext = null;
CompositeComponent composite = (CompositeComponent)context.getMetadata().get(CompositeComponent.class);
if (composite != null) {
- SDOHelperContext sdoContext =
- (SDOHelperContext)composite.getExtensions().get(HelperContext.class.getName());
- if (sdoContext != null) {
- helperContext = sdoContext.getHelperContext();
- }
+// SDOHelperContext sdoContext =
+// (SDOHelperContext)composite.getExtensions().get(HelperContext.class.getName());
+// if (sdoContext != null) {
+// helperContext = sdoContext.getHelperContext();
+// }
AtomicComponent child = (AtomicComponent)composite.getSystemChild(HelperContext.class.getName());
try {
helperContext = (HelperContext)child.getTargetInstance();
} catch (TargetResolutionException e) {
- throw new IllegalArgumentException(e);
+ helperContext = null;
}
}
if (helperContext == null) {
@@ -76,7 +76,7 @@
helperContext = (HelperContext)model.getExtensions().get(ImportSDO.IMPORT_SDO);
if (helperContext == null) {
helperContext = SDOUtil.createHelperContext();
- ((CompositeComponentType<?, ?, ?>)model).getDeclaredExtensions().put(HelperContext.class.getName(),
+ ((CompositeComponentType<?, ?, ?>)model).getDeclaredExtensions().put(ImportSDO.IMPORT_SDO,
helperContext);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org