cziegeler 2003/10/21 00:52:02
Modified:
src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp
XSPSessionFwHelper.java
Log:
Reverting change to the session logicsheet.
Revision Changes Path
1.4 +3 -7
cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java
Index: XSPSessionFwHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSPSessionFwHelper.java 11 Oct 2003 00:02:55 -0000 1.3
+++ XSPSessionFwHelper.java 21 Oct 2003 07:52:02 -0000 1.4
@@ -77,7 +77,7 @@
* @param path The parameter path
* @param defaultValue Value to substitute in absence of the required
Fragment
**/
- public static Object getXML(ComponentManager cm, String context, String
path) throws ProcessingException {
+ public static DocumentFragment getXML(ComponentManager cm, String
context, String path) throws ProcessingException {
SessionManager sessionManager = null;
try {
@@ -85,11 +85,7 @@
sessionManager = (SessionManager)cm.lookup(SessionManager.ROLE);
// Get the fragment
DocumentFragment df = sessionManager.getContextFragment(context,
path);
- if ( df != null ) {
- return df;
- } else {
- return "";
- }
+ return df;
} catch (ComponentException ce) {
throw new ProcessingException("Error during lookup of
SessionManager component.", ce);
} finally {
