Author: sshyrkov Date: Fri Oct 19 16:43:59 2007 New Revision: 18960 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18960&repname= =3Djahia Log: JAHIA-2576: Linked copy + XML Import/Export : NPE =
http://www.jahia.net/jira/browse/JAHIA-2576 Resolution: prevent NPE Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/NodeOperat= ionResult.java Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Node= OperationResult.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/content/NodeOperationResult.java&rev=3D1896= 0&repname=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-5-0-SP-BRANCH/core/src/java/org/jahia/content/NodeOperat= ionResult.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/NodeOperat= ionResult.java Fri Oct 19 16:43:59 2007 @@ -65,7 +65,9 @@ final String languageCode, final String comment, final EngineMessage msg) { - this(nodeKey.getType(), nodeKey.getIdInType(), languageCode, comme= nt, msg); + this(nodeKey !=3D null ? nodeKey.getType() : null, + nodeKey !=3D null ? nodeKey.getIdInType() : 0, languageCod= e, + comment, msg); this.nodeKey =3D nodeKey; } = @@ -78,11 +80,13 @@ this.languageCode =3D languageCode; this.comment =3D comment; this.msg =3D msg; - try { - this.nodeKey =3D ObjectKey.getInstance(objectType - + ObjectKey.KEY_SEPARATOR + objectId); - } catch (ClassNotFoundException ex) { - throw new IllegalArgumentException(ex.getMessage()); + if (objectType !=3D null) { + try { + this.nodeKey =3D ObjectKey.getInstance(objectType + + ObjectKey.KEY_SEPARATOR + objectId); + } catch (ClassNotFoundException ex) { + throw new IllegalArgumentException(ex.getMessage()); + } } } = _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
