From 8dbf42601aa3c631849f725fe88ea055dae967bd Mon Sep 17 00:00:00 2001 From: tosmers Date: Mon, 15 Jun 2015 14:29:17 +0000 Subject: [PATCH] =?UTF-8?q?[UPDATE]=20Weitere=20=C3=84nderungen=20an=20dem?= =?UTF-8?q?=20Initalizer-Problem=20beim=20unload.=20Muss=20noch=20getestet?= =?UTF-8?q?=20werden.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@3485 8810af33-2d31-482b-a856-94f89814c4df --- ccm-core/src/com/arsdigita/packaging/Loader.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ccm-core/src/com/arsdigita/packaging/Loader.java b/ccm-core/src/com/arsdigita/packaging/Loader.java index f485d609c..5dcd06ec4 100755 --- a/ccm-core/src/com/arsdigita/packaging/Loader.java +++ b/ccm-core/src/com/arsdigita/packaging/Loader.java @@ -317,7 +317,8 @@ class Loader { final List required = m_info.getRequiredInitializers(); for (Iterator it = inits.iterator(); it.hasNext(); ) { String init = (String) it.next(); - DataObject dataObject = ssn.retrieve(new OID(INIT, init)); + OID oid = new OID(INIT, init); + DataObject dataObject = ssn.retrieve(oid); DataAssociation da1 = (DataAssociation) dataObject.get("requirements"); @@ -326,9 +327,7 @@ class Loader { da1.remove(ssn.retrieve(new OID(INIT, reqInit))); } - DataAssociation da2 = - (DataAssociation) dataObject.get("inits"); - da2.remove(ssn.retrieve(new OID(INIT, init))); + ssn.delete(oid); } if (txn.inTxn()) {