You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/03/20 20:17:27 UTC
svn commit: r520528 -
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java
Author: meerajk
Date: Tue Mar 20 12:17:26 2007
New Revision: 520528
URL: http://svn.apache.org/viewvc?view=rev&rev=520528
Log:
Added code to get to the document element.
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java?view=diff&rev=520528&r1=520527&r2=520528
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java Tue Mar 20 12:17:26 2007
@@ -18,9 +18,13 @@
*/
package org.apache.tuscany.core.deployer.federation;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+
import java.util.Set;
import java.util.ArrayList;
import java.util.List;
+
+import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller;
@@ -80,6 +84,10 @@
try {
+ // Get to the document element
+ while(content.next() != START_ELEMENT) {
+ }
+
final PhysicalChangeSet changeSet = (PhysicalChangeSet) marshallerRegistry.unmarshall(content);
applyChangeSet(changeSet);
} catch (MarshalException ex) {
@@ -87,6 +95,8 @@
} catch (BuilderException ex) {
return null;
} catch (RegistrationException ex) {
+ return null;
+ } catch (XMLStreamException ex) {
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org