diff --git a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java index 77d9afa052d7e8e721ab6c771940935ab680a5e1..59f4a41cd50c36cc874f978713d0d3a0d33ade5a 100644 --- a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java +++ b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java @@ -32,7 +32,6 @@ import org.eclipse.jetty.server.Response; import org.eclipse.jetty.util.DateCache; import org.eclipse.jetty.util.RolloverFileOutputStream; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.Utf8StringBuilder; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.log.Log; @@ -83,7 +82,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog private transient DateCache _logDateCache; private transient PathMap _ignorePathMap; private transient Writer _writer; - private transient ArrayList _buffers; + private transient ArrayList<Utf8StringBuilder> _buffers; private transient char[] _copy; @@ -262,7 +261,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog synchronized(_writer) { int size=_buffers.size(); - u8buf = size==0?new Utf8StringBuilder(160):(Utf8StringBuilder)_buffers.remove(size-1); + u8buf = size==0?new Utf8StringBuilder(160):_buffers.remove(size-1); buf = u8buf.getStringBuilder(); } @@ -467,7 +466,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog _ignorePathMap = null; _writer = new OutputStreamWriter(_out); - _buffers = new ArrayList(); + _buffers = new ArrayList<Utf8StringBuilder>(); _copy = new char[1024]; super.doStart(); } diff --git a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java index 1a7daa2baeaa907d85cfea39c29577e77a7f532d..5e54255f0d519074edd9dfc7314416b08b7f29b2 100644 --- a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java +++ b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java @@ -57,7 +57,7 @@ public class JettyStart implements ClientApp { _state = UNINITIALIZED; _mgr = mgr; _args = args; - _jettys = new ArrayList(args.length); + _jettys = new ArrayList<LifeCycle>(args.length); parseArgs(args); _state = INITIALIZED; }