cvs commit: jahia/core/src/java/org/jahia/services/importexport ImportHandler.java

[Thomas Draier]

tdraier     2005/11/23 16:51:03 CET

  Modified files:
    core/src/java/org/jahia/services/importexport 
                                                  ImportHandler.java 
  Log:
  avoid npe
  
  Revision  Changes    Path
  1.49      +1 -1      
jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java.diff?r1=1.48&r2=1.49&f=h
  
  
  
  Index: ImportHandler.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- ImportHandler.java        18 Nov 2005 15:00:33 -0000      1.48
  +++ ImportHandler.java        23 Nov 2005 15:51:03 -0000      1.49
  @@ -269,7 +269,7 @@
                                           ContentContainer contentContainer = 
(ContentContainer) iterator.next();
                                           Map p = 
ServicesRegistry.getInstance().getJahiaContainersService().getContainerProperties(contentContainer.getID());
                                           //System.out.println("-------- 
"+contentContainer.getObjectKey() + "---->" + p.get("uuid"));
  -                                        if (uuid != null && 
p.get("uuid").equals(uuid)) {
  +                                        if (uuid != null && 
uuid.equals(p.get("uuid"))) {
                                               iIndex = new 
Integer(l.indexOf(contentContainer));
                                               break;
                                           }