ate 2004/10/31 12:10:00
Modified: components/page-manager/src/java/org/apache/jetspeed/page/impl
AbstractPageManager.java
Log:
NPE patch supplied by Randy Watler
Revision Changes Path
1.7 +7 -4
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java
Index: AbstractPageManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractPageManager.java 21 Oct 2004 02:28:07 -0000 1.6
+++ AbstractPageManager.java 31 Oct 2004 20:10:00 -0000 1.7
@@ -255,10 +255,13 @@
to.setSiblingFolders(from.getSiblingFolders());
to.setRootLinks(from.getRootLinks());
Iterator documentSetNamesIter = from.getDocumentSetNames();
- while (documentSetNamesIter.hasNext())
+ if (documentSetNamesIter != null)
{
- String documentSetName = (String) documentSetNamesIter.next();
- to.setDocumentSet(documentSetName,
from.getDocumentSet(documentSetName), from.getDocumentSetNodes(documentSetName));
+ while (documentSetNamesIter.hasNext())
+ {
+ String documentSetName = (String) documentSetNamesIter.next();
+ to.setDocumentSet(documentSetName,
from.getDocumentSet(documentSetName), from.getDocumentSetNodes(documentSetName));
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
