Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

abstracted AbstractHandler setServer

This commit is contained in:
Greg Wilkins 2015-05-20 11:21:26 +10:00
parent 82dc72cac2
commit 02a1350965
6 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java
View File

@ -36,6 +36,7 @@ import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.HandlerWrapper;
import org.eclipse.jetty.server.handler.RequestLogHandler;
import org.eclipse.jetty.server.handler.gzip.GzipHandler;
import org.eclipse.jetty.util.ajax.JSON;
/**
@ -127,7 +128,7 @@ public class ManyHandlers
// link them all together
wrapper.setHandler(hello);
list.setHandlers(new Handler[] { param, wrapper, dft });
list.setHandlers(new Handler[] { param, new GzipHandler(), dft });
handlers.setHandlers(new Handler[] { list, requestLog });
// Handler tree looks like the following

18
jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandlerContainer.java
View File

@ -25,6 +25,7 @@ import java.util.List;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.HandlerContainer;
import org.eclipse.jetty.server.Server;
/* ------------------------------------------------------------ */
@ -117,4 +118,21 @@ public abstract class AbstractHandlerContainer extends AbstractHandler implement
}
return null;
}
/* ------------------------------------------------------------ */
@Override
public void setServer(Server server)
{
if (server==getServer())
return;
if (isStarted())
throw new IllegalStateException(STARTED);
super.setServer(server);
Handler[] handlers=getHandlers();
if (handlers!=null)
for (Handler h : handlers)
h.setServer(server);
}
}

11
jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java
View File

@ -134,17 +134,6 @@ public class HandlerCollection extends AbstractHandlerContainer
}
}
/* ------------------------------------------------------------ */
@Override
public void setServer(Server server)
{
super.setServer(server);
Handler[] handlers=getHandlers();
if (handlers!=null)
for (Handler h : handlers)
h.setServer(server);
}
/* ------------------------------------------------------------ */
/* Add a handler.
* This implementation adds the passed handler to the end of the existing collection of handlers.

17
jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerWrapper.java
View File

@ -120,23 +120,6 @@ public class HandlerWrapper extends AbstractHandlerContainer
}
/* ------------------------------------------------------------ */
@Override
public void setServer(Server server)
{
if (server==getServer())
return;
if (isStarted())
throw new IllegalStateException(STARTED);
super.setServer(server);
Handler h=getHandler();
if (h!=null)
h.setServer(server);
}
/* ------------------------------------------------------------ */
@Override
protected void expandChildren(List<Handler> list, Class<?> byClass)

14
jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java
View File

@ -122,20 +122,6 @@ public class HotSwapHandler extends AbstractHandlerContainer
}
}
/* ------------------------------------------------------------ */
@Override
public void setServer(Server server)
{
if (isRunning())
throw new IllegalStateException(RUNNING);
super.setServer(server);
Handler h = getHandler();
if (h != null)
h.setServer(server);
}
/* ------------------------------------------------------------ */
@Override
protected void expandChildren(List<Handler> list, Class<?> byClass)

3
jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
View File

@ -380,7 +380,8 @@ public class GzipHandler extends HandlerWrapper implements GzipFactory
// install interceptor and handle
out.setInterceptor(new GzipHttpOutputInterceptor(this,_vary,baseRequest.getHttpChannel(),out.getInterceptor()));
_handler.handle(target,baseRequest, request, response);
if (_handler!=null)
_handler.handle(target,baseRequest, request, response);
}