From c35793fb468aac4fe5a9dcbdfb8847382de26edf Mon Sep 17 00:00:00 2001 From: allo Date: Sat, 21 Oct 2006 16:41:22 +0000 Subject: [PATCH] fix for last commit git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2838 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- source/de/anomic/http/httpdFileHandler.java | 7 ++++++- source/de/anomic/server/servletProperties.java | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/source/de/anomic/http/httpdFileHandler.java b/source/de/anomic/http/httpdFileHandler.java index 7fc3b51e2..4e4dfa62d 100644 --- a/source/de/anomic/http/httpdFileHandler.java +++ b/source/de/anomic/http/httpdFileHandler.java @@ -608,7 +608,12 @@ public final class httpdFileHandler extends httpdAbstractHandler implements http requestHeader.put("CLIENTIP", conProp.getProperty("CLIENTIP")); requestHeader.put("PATH", path); // in case that there are no args given, args = null or empty hashmap - tp = (servletProperties) invokeServlet(targetClass, requestHeader, args); + Object o = invokeServlet(targetClass, requestHeader, args); + if(o instanceof serverObjects){ + tp=new servletProperties((serverObjects)o); + }else{ + tp=(servletProperties)o; + } // if no args given , then tp will be an empty Hashtable object (not null) if (tp == null) tp = new servletProperties(); // check if the servlets requests authentification diff --git a/source/de/anomic/server/servletProperties.java b/source/de/anomic/server/servletProperties.java index 07ecd99da..6194f334d 100644 --- a/source/de/anomic/server/servletProperties.java +++ b/source/de/anomic/server/servletProperties.java @@ -27,6 +27,12 @@ public class servletProperties extends serverObjects { private String prefix=""; private httpHeader outgoingHeader; + public servletProperties(){ + super(); + } + public servletProperties(serverObjects so){ + super(so); + } public void setOutgoingHeader(httpHeader outgoingHeader) { this.outgoingHeader=outgoingHeader;