LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[UPDATE] 

Weitere Änderungen an dem Initalizer-Problem beim unload. Muss noch getestet werden.

git-svn-id: https://svn.libreccm.org/ccm/trunk@3485 8810af33-2d31-482b-a856-94f89814c4df
master
tosmers 2015-06-15 14:29:17 +00:00
parent e11267a809
commit 8dbf42601a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ccm-core/src/com/arsdigita/packaging/Loader.java
View File

@ -317,7 +317,8 @@ class Loader {
final List required = m_info.getRequiredInitializers(); final List required = m_info.getRequiredInitializers();
for (Iterator it = inits.iterator(); it.hasNext(); ) { for (Iterator it = inits.iterator(); it.hasNext(); ) {
String init = (String) it.next(); 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 da1 =
(DataAssociation) dataObject.get("requirements"); (DataAssociation) dataObject.get("requirements");
@ -326,9 +327,7 @@ class Loader {
da1.remove(ssn.retrieve(new OID(INIT, reqInit))); da1.remove(ssn.retrieve(new OID(INIT, reqInit)));
} }
DataAssociation da2 = ssn.delete(oid);
(DataAssociation) dataObject.get("inits");
da2.remove(ssn.retrieve(new OID(INIT, init)));
} }
if (txn.inTxn()) { if (txn.inTxn()) {