Scarab commit: svn commit: r10555 - trunk/src/java/org/tigris/scarab: om util/xmlissues

Author: hair
Date: 2008-05-05 07:35:19-0700
New Revision: 10555

Modified:
   trunk/src/java/org/tigris/scarab/om/Issue.java
   trunk/src/java/org/tigris/scarab/util/xmlissues/ScarabIssues.java

Log:
svn merge -r10490:10489 http://subversion.tigris.org/svn/scarab/trunk

Modified: trunk/src/java/org/tigris/scarab/om/Issue.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/Issue.java?view=diff&rev=10555&p1=trunk/src/java/org/tigris/scarab/om/Issue.java&p2=trunk/src/java/org/tigris/scarab/om/Issue.java&r1=10554&r2=10555
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/Issue.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/Issue.java	2008-05-05 07:35:19-0700
@@ -2082,11 +2082,6 @@
                 }
             }
         }
-        if(  getActivitySetRelatedByLastTransId()==null
-           ||getActivitySetRelatedByCreatedTransId()==null)
-        {
-            throw new RuntimeException("Created or Last ActivitySet must not be null.");
-        }
         super.save(dbCon);
     }
 
@@ -2379,12 +2374,12 @@
         {
             newIssue = this;
             newIssue.setIssueType(newIssueType);
-            newIssue.save();
         }
         else
         {
             newIssue = newModule.getNewIssue(newIssueType);
         }
+        newIssue.save();
 
         if (newIssue != this)
         {
@@ -4009,12 +4004,4 @@
     {
         return ActivityPeer.getNewIssueUniqueId(this);
     }
-
-    public void setCreatedTransId(Long createdTransId) 
-        throws TorqueException
-    {
-        super.setCreatedTransId(createdTransId);
-        if(super.getLastTransId()==null)
-            super.setLastTransId(createdTransId);
-    }
 }

Modified: trunk/src/java/org/tigris/scarab/util/xmlissues/ScarabIssues.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/xmlissues/ScarabIssues.java?view=diff&rev=10555&p1=trunk/src/java/org/tigris/scarab/util/xmlissues/ScarabIssues.java&p2=trunk/src/java/org/tigris/scarab/util/xmlissues/ScarabIssues.java&r1=10554&r2=10555
==============================================================================
--- trunk/src/java/org/tigris/scarab/util/xmlissues/ScarabIssues.java	(original)
+++ trunk/src/java/org/tigris/scarab/util/xmlissues/ScarabIssues.java	2008-05-05 07:35:19-0700
@@ -912,6 +912,7 @@
             issueOM.setFederatedId(id);
         }
         // create the issue in the database
+        issueOM.save();
 
         // Add the mapping between the issue id and the id that was created.
         // This mapping is used dependency checking and printing out in