dpillot 2005/12/01 12:01:42 CET
Modified files:
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
Log:
avoid npe from searchservice
Revision Changes Path
1.55 +7 -1
jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java.diff?r1=1.54&r2=1.55&f=h
Index: ManageContentPicker.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ManageContentPicker.java 30 Nov 2005 11:01:28 -0000 1.54
+++ ManageContentPicker.java 1 Dec 2005 11:01:42 -0000 1.55
@@ -42,7 +42,7 @@
*
* @author Thomas Draier, joe Pillot
* @author ${User}
- * @version $Id: ManageContentPicker.java,v 1.54 2005/11/30 11:01:28 dpillot
Exp $
+ * @version $Id: ManageContentPicker.java,v 1.55 2005/12/01 11:01:42 dpillot
Exp $
*/
public class ManageContentPicker {
private static org.apache.log4j.Logger logger =
@@ -525,7 +525,10 @@
while (sites.hasMoreElements()) {
SearchHandler h =
searchService.getSearchHandler(((JahiaSite) sites.nextElement()).getID());
+ //defensive code
+ if(h!= null){
handlers.add(h.getName());
+ }
}
String[] strings = (String[]) handlers.toArray(new
String[handlers.size()]);
logger.debug(strings);
@@ -865,6 +868,9 @@
}
/**
* $Log: ManageContentPicker.java,v $
+ * Revision 1.55 2005/12/01 11:01:42 dpillot
+ * avoid npe from searchservice
+ *
* Revision 1.54 2005/11/30 11:01:28 dpillot
* cluster bug fix
*
