ozeigermann 2004/09/07 21:20:23
Modified: src/share/org/apache/slide/common Namespace.java
Log:
Applied patch by Thomas Draier to take care of transaction problem
described in issue #31102.
Revision Changes Path
1.66 +8 -26 jakarta-slide/src/share/org/apache/slide/common/Namespace.java
Index: Namespace.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Namespace.java 5 Aug 2004 15:42:32 -0000 1.65
+++ Namespace.java 8 Sep 2004 04:20:23 -0000 1.66
@@ -777,18 +777,9 @@
// First, we create the root node
Uri rootUri = getUri(slideToken, "/");
SubjectNode rootNode = new SubjectNode("/");
- try {
- rootUri.getStore().createObject(rootUri, rootNode);
- } catch (ObjectAlreadyExistsException e) {
- // abort the failed transaction
- getTransactionManager().rollback();
- // start a new one to continue processing
- getTransactionManager().begin();
- }
-
- // end transaction for temp object creation
- getTransactionManager().commit();
-
+
+ rootUri.getStore().createObject(rootUri, rootNode);
+
getLogger().log("Init namespace " + getName() + "
configuration",LOG_CHANNEL,Logger.INFO);
// Create the dummy configuration
@@ -796,18 +787,9 @@
// Create the Access token
NamespaceAccessToken token = new NamespaceAccessTokenImpl(this);
-
- // start the transaction, NOTE some operations are outside this TA
- token.begin();
-
+
getLogger().log("Import data into namespace " +
getName(),LOG_CHANNEL,Logger.INFO);
token.importData(slideToken, namespaceBaseDataDefinition);
-
- // end the transaction, NOTE some operations are outside this TA
- token.commit();
-
- // start transaction for temp object removal
- getTransactionManager().begin();
getLogger().log("Finish init namespace " + getName() + "
configuration",LOG_CHANNEL,Logger.INFO);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
