double rollback bug fixed

SVN: 15629

rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/etlserver/phosphonetx/ProtXMLUploader.java

@@ -113,14 +113,24 @@ public class ProtXMLUploader implements IDataSetUploader
 
     public void commit()
     {
-        currentResultDataSetUploader.commit();
-        currentResultDataSetUploader = null;
+        try
+        {
+            currentResultDataSetUploader.commit();
+        } finally
+        {
+            currentResultDataSetUploader = null;
+        }
     }
 
     public void rollback()
     {
-        currentResultDataSetUploader.rollback();
-        currentResultDataSetUploader = null;
+        try
+        {
+            currentResultDataSetUploader.rollback();
+        } finally
+        {
+            currentResultDataSetUploader = null;
+        }
     }
 
     protected ResultDataSetUploader createUploader()

rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/etlserver/phosphonetx/ResultDataSetUploader.java

@@ -117,8 +117,11 @@ class ResultDataSetUploader extends AbstractHandler
     {
         try
         {
-            connection.rollback();
-            connection.close();
+            if (connection.isClosed() == false)
+            {
+                connection.rollback();
+                connection.close();
+            }
         } catch (SQLException ex)
         {
             throw CheckedExceptionTunnel.wrapIfNecessary(ex);