cziegeler 01/11/15 03:21:10
Modified: src/org/apache/cocoon/transformation TraxTransformer.java
Log:
Changed use of deprecated method
Revision Changes Path
1.37 +31 -28
xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- TraxTransformer.java 2001/11/13 07:36:24 1.36
+++ TraxTransformer.java 2001/11/15 11:21:09 1.37
@@ -103,7 +103,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ovidiu Predescu</a>
- * @version CVS $Id: TraxTransformer.java,v 1.36 2001/11/13 07:36:24 cziegeler Exp $
+ * @version CVS $Id: TraxTransformer.java,v 1.37 2001/11/15 11:21:09 cziegeler Exp $
*/
public class TraxTransformer extends AbstractTransformer
implements Transformer, Composable, Recyclable, Configurable, Cacheable, Disposable
{
@@ -303,16 +303,18 @@
private HashMap getLogicSheetParameters() {
HashMap map = null;
if (par != null) {
- Iterator params = par.getParameterNames();
- while (params.hasNext()) {
- String name = (String) params.next();
- if (isValidXSLTParameterName(name)) {
- String value = par.getParameter(name,null);
- if (value != null) {
- if (map == null) {
- map = new HashMap();
+ String[] params = par.getNames();
+ if (params != null) {
+ for(int i = 0; i < params.length; i++) {
+ String name = (String) params[i];
+ if (isValidXSLTParameterName(name)) {
+ String value = par.getParameter(name,null);
+ if (value != null) {
+ if (map == null) {
+ map = new HashMap();
+ }
+ map.put(name,value);
}
- map.put(name,value);
}
}
}
@@ -322,18 +324,16 @@
/** The Request object */
Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
- if (request != null) {
- Enumeration parameters = request.getParameterNames();
- if ( parameters != null ) {
- while (parameters.hasMoreElements()) {
- String name = (String) parameters.nextElement();
- if (isValidXSLTParameterName(name)) {
- String value = request.getParameter(name);
- if (map == null) {
- map = new HashMap();
- }
- map.put(name,value);
+ Enumeration parameters = request.getParameterNames();
+ if ( parameters != null ) {
+ while (parameters.hasMoreElements()) {
+ String name = (String) parameters.nextElement();
+ if (isValidXSLTParameterName(name)) {
+ String value = request.getParameter(name);
+ if (map == null) {
+ map = new HashMap();
}
+ map.put(name,value);
}
}
}
@@ -344,13 +344,16 @@
Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
if (map == null) map = new HashMap(5);
- if (request != null) {
- Session session = request.getSession(true);
- map.put("session-is-new",session.isNew()?"true":"false");
-
map.put("session-id-from-cookie",request.isRequestedSessionIdFromCookie()?"true":"false");
-
map.put("session-id-from-url",request.isRequestedSessionIdFromURL()?"true":"false");
-
map.put("session-valid",request.isRequestedSessionIdValid()?"true":"false");
- map.put("session-id",session.getId());
+ Session session = request.getSession(false);
+ if (session != null) {
+ map.put("session-available","true");
+ map.put("session-is-new",session.isNew()?"true":"false");
+
map.put("session-id-from-cookie",request.isRequestedSessionIdFromCookie()?"true":"false");
+
map.put("session-id-from-url",request.isRequestedSessionIdFromURL()?"true":"false");
+
map.put("session-valid",request.isRequestedSessionIdValid()?"true":"false");
+ map.put("session-id",session.getId());
+ } else {
+ map.put("session-available","false");
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
