slub.team team mailing list archive

[Henning Gerhardt <henning.gerhardt@xxxxxxxxxxxxxxx>]

Henning Gerhardt has proposed merging lp:~slub.team/goobi-production/bug-1040672 into lp:goobi-production.

Requested reviews:
  Ralf Claussnitzer (ralf-claussnitzer)
Related bugs:
  Bug #1040672 in Goobi.Production: "crash on automated script step parameter replacement"
  https://bugs.launchpad.net/goobi-production/+bug/1040672

For more details, see:
https://code.launchpad.net/~slub.team/goobi-production/bug-1040672/+merge/121372
-- 
https://code.launchpad.net/~slub.team/goobi-production/bug-1040672/+merge/121372
Your team Saxon State Library Team is subscribed to branch lp:goobi-production.

=== modified file 'src/de/sub/goobi/beans/Prozess.java'
--- src/de/sub/goobi/beans/Prozess.java	2012-07-30 11:42:24 +0000
+++ src/de/sub/goobi/beans/Prozess.java	2012-08-27 07:45:24 +0000
@@ -42,6 +42,8 @@
 import org.goobi.production.api.property.xmlbasedprovider.Status;
 import org.goobi.production.export.ExportDocket;
 
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
 import ugh.dl.Fileformat;
 import ugh.exceptions.PreferencesException;
 import ugh.exceptions.ReadException;
@@ -427,6 +429,13 @@
 	}
 
 	public List<Prozesseigenschaft> getEigenschaftenList() {
+		if (!Hibernate.isInitialized(eigenschaften)) {
+			try {
+				Hibernate.initialize(eigenschaften);
+			} catch(HibernateException he) {
+				myLogger.warn("Could not initialise object 'eigenschaften'", he);
+			}
+		}
 		if (eigenschaften == null) {
 			return new ArrayList<Prozesseigenschaft>();
 		} else {

=== modified file 'src/de/sub/goobi/beans/Vorlage.java'
--- src/de/sub/goobi/beans/Vorlage.java	2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/beans/Vorlage.java	2012-08-27 07:45:24 +0000
@@ -28,14 +28,18 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.log4j.Logger;
 import org.goobi.production.api.property.xmlbasedprovider.Status;
 
 import de.sub.goobi.beans.property.DisplayPropertyList;
 import de.sub.goobi.beans.property.IGoobiEntity;
 import de.sub.goobi.beans.property.IGoobiProperty;
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
 
 public class Vorlage implements Serializable, IGoobiEntity {
    private static final long serialVersionUID = 1736135433162833277L;
+   private static final Logger myLogger = Logger.getLogger(Vorlage.class);
    private Integer id;
    private String herkunft;
    private Prozess prozess;
@@ -114,9 +118,18 @@
    }
 
    public List<Vorlageeigenschaft> getEigenschaftenList() {
-      if (eigenschaften == null)
-         return new ArrayList<Vorlageeigenschaft>();
-      return new ArrayList<Vorlageeigenschaft>(eigenschaften);
+		if (!Hibernate.isInitialized(eigenschaften)) {
+			try {
+				Hibernate.initialize(eigenschaften);
+			} catch(HibernateException he) {
+				myLogger.warn("Could not initialise object 'eigenschaften'", he);
+			}
+		}
+
+		if (eigenschaften == null) {
+			return new ArrayList<Vorlageeigenschaft>();
+		}
+		return new ArrayList<Vorlageeigenschaft>(eigenschaften);
    }
    
 	public Status getStatus() {

=== modified file 'src/de/sub/goobi/beans/Werkstueck.java'
--- src/de/sub/goobi/beans/Werkstueck.java	2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/beans/Werkstueck.java	2012-08-27 07:45:24 +0000
@@ -28,14 +28,18 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.log4j.Logger;
 import org.goobi.production.api.property.xmlbasedprovider.Status;
 
 import de.sub.goobi.beans.property.DisplayPropertyList;
 import de.sub.goobi.beans.property.IGoobiEntity;
 import de.sub.goobi.beans.property.IGoobiProperty;
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
 
 public class Werkstueck implements Serializable, IGoobiEntity {
 	private static final long serialVersionUID = 123266825187246791L;
+	private static final Logger myLogger = Logger.getLogger(Werkstueck.class);
 	private Integer id;
 	private Prozess prozess;
 	private Set<Werkstueckeigenschaft> eigenschaften;
@@ -97,6 +101,14 @@
 	}
 
 	public List<Werkstueckeigenschaft> getEigenschaftenList() {
+		if (!Hibernate.isInitialized(eigenschaften)) {
+			try {
+				Hibernate.initialize(eigenschaften);
+			} catch(HibernateException he) {
+				myLogger.warn("Could not initialise object 'eigenschaften'", he);
+			}
+		}
+
 		if (eigenschaften == null)
 			return new ArrayList<Werkstueckeigenschaft>();
 		return new ArrayList<Werkstueckeigenschaft>(eigenschaften);