Author: bpapez
Date: Tue Dec 4 14:08:13 2007
New Revision: 19340
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19340&repname=
=3Djahia
Log:
When unique key is set to the jahia_link table, ignore the resulting SQLExc=
eptions that duplicate key already exists
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/content/CrossReferenceMana=
ger.java
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/content/CrossReferen=
ceManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/content/CrossReferenceManager.java&rev=3D19340&repn=
ame=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/content/CrossReferenceMana=
ger.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/content/CrossReferenceMana=
ger.java Tue Dec 4 14:08:13 2007
@@ -41,6 +41,7 @@
=
package org.jahia.content;
=
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -241,17 +242,26 @@
curXRefSet =3D new TreeSet (new ObjectKeyComparator ());
}
=
- if (!curXRefSet.contains (objectXRef)) {
- ObjectLink.createLink (objectXRef, objectKey, REFERENCE_TYPE, =
1,
- new Date (),
- "root:0", new Date (), "root:0", new HashMap (),
- new HashMap (), new HashMap ());
- Set newXRefSet =3D new TreeSet (new ObjectKeyComparator ());
- newXRefSet.addAll(curXRefSet);
- newXRefSet.add (objectXRef);
- =
- // add the modified curXRefSet
- crossRefTable.put (objectKey, newXRefSet); =
+ if (!curXRefSet.contains(objectXRef)) {
+ try {
+ ObjectLink.createLink(objectXRef, objectKey, REFERENCE_TYP=
E, 1,
+ new Date(), "root:0", new Date(), "root:0",
+ new HashMap(), new HashMap(), new HashMap());
+ Set newXRefSet =3D new TreeSet(new ObjectKeyComparator());
+ newXRefSet.addAll(curXRefSet);
+ newXRefSet.add(objectXRef);
+
+ // add the modified curXRefSet
+ crossRefTable.put(objectKey, newXRefSet);
+ } catch (JahiaException ex) {
+ logger.warn("Could not add X-REF link for objectXRef: "
+ + objectXRef
+ + " objectKey: "
+ + objectKey
+ + ". Cause:"
+ + (ex.getCause() instanceof SQLException ? ex
+ .getCause().getMessage() : ""));
+ }
}
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
