bloritsch 01/12/28 10:54:35
Modified: src/org/apache/cocoon/acting ResourceExistsAction.java
SendmailAction.java SessionInvalidatorAction.java
SessionIsValidAction.java
Log:
remove unnecessary object creation
Revision Changes Path
1.13 +2 -3
xml-cocoon2/src/org/apache/cocoon/acting/ResourceExistsAction.java
Index: ResourceExistsAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ResourceExistsAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ResourceExistsAction.java 2001/10/11 07:28:16 1.12
+++ ResourceExistsAction.java 2001/12/28 18:54:35 1.13
@@ -23,12 +23,11 @@
* null otherwise. It has only been tested with context urls.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Revision: 1.12 $ $Date: 2001/10/11 07:28:16 $
+ * @version CVS $Revision: 1.13 $ $Date: 2001/12/28 18:54:35 $
*/
public class ResourceExistsAction extends ComposerAction implements ThreadSafe {
public Map act(Redirector redirector, SourceResolver resolver, Map objectModel,
String source, Parameters parameters) throws Exception {
- HashMap results = new HashMap();
String urlstring = parameters.getParameter("url",null);
Source src = null;
try {
@@ -40,7 +39,7 @@
} finally {
if (src != null) src.recycle();
}
- return Collections.unmodifiableMap(results);
+ return Collections.EMPTY_MAP;
}
}
1.13 +2 -3 xml-cocoon2/src/org/apache/cocoon/acting/SendmailAction.java
Index: SendmailAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SendmailAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SendmailAction.java 2001/11/28 09:21:22 1.12
+++ SendmailAction.java 2001/12/28 18:54:35 1.13
@@ -61,7 +61,6 @@
}
public Map act(Redirector redirector, SourceResolver resolver, Map objectModel,
String source, Parameters parameters) throws Exception {
- HashMap results = new HashMap();
try {
getLogger().debug("SendmailAction: act start");
Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
@@ -111,10 +110,10 @@
message.setSentDate(new Date());
Transport.send(message);
getLogger().debug("SendmailAction: act stop");
- return Collections.unmodifiableMap(results);
+ return Collections.EMPTY_MAP;
} catch (SendmailActionException e) {
getLogger().error("SendmailAction: "+e.getMessage());
- return Collections.unmodifiableMap(results);
+ return Collections.EMPTY_MAP;
}
}
1.8 +4 -5
xml-cocoon2/src/org/apache/cocoon/acting/SessionInvalidatorAction.java
Index: SessionInvalidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionInvalidatorAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SessionInvalidatorAction.java 2001/10/11 07:28:16 1.7
+++ SessionInvalidatorAction.java 2001/12/28 18:54:35 1.8
@@ -1,4 +1,4 @@
-// $Id: SessionInvalidatorAction.java,v 1.7 2001/10/11 07:28:16 cziegeler Exp $
+// $Id: SessionInvalidatorAction.java,v 1.8 2001/12/28 18:54:35 bloritsch Exp $
package org.apache.cocoon.acting;
import org.apache.avalon.framework.parameters.Parameters;
@@ -18,7 +18,7 @@
* empty map if everything is ok, null otherwise.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.7 $ $Date: 2001/10/11 07:28:16 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/12/28 18:54:35 $
*/
public class SessionInvalidatorAction extends AbstractAction implements ThreadSafe
{
@@ -29,7 +29,6 @@
Parameters parameters) throws Exception {
Request req = (Request)
objectModel.get (Constants.REQUEST_OBJECT);
- HashMap actionMap = new HashMap ();
/* check request validity */
if (req == null) {
@@ -46,9 +45,9 @@
getLogger ().debug ("SESSIONINVALIDATOR: no session object");
}
- return Collections.unmodifiableMap (actionMap);
+ return Collections.EMPTY_MAP; // cut down on object creation
}
}
-// $Id: SessionInvalidatorAction.java,v 1.7 2001/10/11 07:28:16 cziegeler Exp $
+// $Id: SessionInvalidatorAction.java,v 1.8 2001/12/28 18:54:35 bloritsch Exp $
// vim: set et ts=4 sw=4:
1.6 +5 -5
xml-cocoon2/src/org/apache/cocoon/acting/SessionIsValidAction.java
Index: SessionIsValidAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionIsValidAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SessionIsValidAction.java 2001/10/11 07:28:16 1.5
+++ SessionIsValidAction.java 2001/12/28 18:54:35 1.6
@@ -15,7 +15,7 @@
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-import java.util.HashMap;
+import java.util.Collections;
import java.util.Map;
@@ -24,7 +24,7 @@
* seesion is still valid.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/10/11 07:28:16 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/12/28 18:54:35 $
*/
public class SessionIsValidAction extends AbstractValidatorAction implements
ThreadSafe
@@ -48,12 +48,12 @@
getLogger ().debug ("SESSIONVALIDATOR: no session object");
return null;
}
- if (!req.isRequestedSessionIdValid()) {
+ if (!req.isRequestedSessionIdValid()) {
getLogger ().debug ("SESSIONVALIDATOR: requested session id is
invalid");
return null;
}
-
- return new HashMap();
+
+ return Collections.EMPTY_MAP;
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
