cziegeler 2002/08/05 04:12:07
Modified: . Tag: cocoon_2_0_3_branch changes.xml
src/java/org/apache/cocoon/sitemap Tag: cocoon_2_0_3_branch
ContentAggregator.java
src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/context
Tag: cocoon_2_0_3_branch
SessionContextProviderImpl.java
Log:
Fixed NPE
Revision Changes Path
No revision
No revision
1.138.2.44 +4 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.138.2.43
retrieving revision 1.138.2.44
diff -u -r1.138.2.43 -r1.138.2.44
--- changes.xml 4 Aug 2002 04:11:51 -0000 1.138.2.43
+++ changes.xml 5 Aug 2002 11:12:06 -0000 1.138.2.44
@@ -39,6 +39,9 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="fix">
+ Fixed NPE in the recycling phase of content aggregation.
+ </action>
<action dev="VG" type="fix" fixes-bug="9288">
Fixed bug in cocoon pseudo protocol involving aggregation of aggregated
resources spanning several sitemaps.
No revision
No revision
1.4.2.1 +5 -3
xml-cocoon2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java
Index: ContentAggregator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- ContentAggregator.java 22 Feb 2002 07:03:55 -0000 1.4
+++ ContentAggregator.java 5 Aug 2002 11:12:07 -0000 1.4.2.1
@@ -286,8 +286,10 @@
public void recycle() {
super.recycle();
this.rootElement = null;
- for (Iterator i = this.parts.iterator(); i.hasNext();)
- ((Part)i.next()).source.recycle();
+ for (Iterator i = this.parts.iterator(); i.hasNext();) {
+ final Source source = ((Part)i.next()).source;
+ if ( null != source) source.recycle();
+ }
this.parts.clear();
this.currentElement = null;
}
No revision
No revision
1.2.2.2 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/context/Attic/SessionContextProviderImpl.java
Index: SessionContextProviderImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/context/Attic/SessionContextProviderImpl.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- SessionContextProviderImpl.java 7 Jun 2002 09:34:26 -0000 1.2.2.1
+++ SessionContextProviderImpl.java 5 Aug 2002 11:12:07 -0000 1.2.2.2
@@ -85,7 +85,7 @@
* @param name The name of the context
* @param objectModel The objectModel of the current request.
* @result The context
- * @throws SunShineException If the context is not available.
+ * @throws ProcessingException If the context is not available.
*/
public SessionContext getSessionContext(String name,
Map objectModel,
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
