diff --git a/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java index ccac7cb6a23..1d1e48f7283 100644 --- a/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java +++ b/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java @@ -505,7 +505,7 @@ public class StandardSession implements ISession, Parser.Listener, ISession.Cont { if (frameListener != null) { - logger.debug("Invoking syn callback with frame {} on listener {}", frame, frameListener); + logger.debug("Invoking callback with {} on listener {}", frame, frameListener); SynInfo synInfo = new SynInfo(frame.getHeaders(), frame.isClose(), frame.isUnidirectional(), frame.getAssociatedStreamId(), frame.getPriority()); return frameListener.onSyn(stream, synInfo); } @@ -523,7 +523,7 @@ public class StandardSession implements ISession, Parser.Listener, ISession.Cont { if (frameListener != null) { - logger.debug("Invoking rst callback with frame {} on listener {}", frame, frameListener); + logger.debug("Invoking callback with {} on listener {}", frame, frameListener); RstInfo rstInfo = new RstInfo(frame.getStreamId(), StreamStatus.from(frame.getVersion(), frame.getStatusCode())); frameListener.onRst(this, rstInfo); } @@ -540,7 +540,7 @@ public class StandardSession implements ISession, Parser.Listener, ISession.Cont { if (frameListener != null) { - logger.debug("Invoking settings callback with frame {} on listener {}", frame, frameListener); + logger.debug("Invoking callback with {} on listener {}", frame, frameListener); SettingsInfo settingsInfo = new SettingsInfo(frame.getSettings(), frame.isClearPersisted()); frameListener.onSettings(this, settingsInfo); } @@ -557,7 +557,7 @@ public class StandardSession implements ISession, Parser.Listener, ISession.Cont { if (frameListener != null) { - logger.debug("Invoking ping callback with frame {} on listener {}", frame, frameListener); + logger.debug("Invoking callback with {} on listener {}", frame, frameListener); PingInfo pingInfo = new PingInfo(frame.getPingId()); frameListener.onPing(this, pingInfo); } @@ -574,7 +574,7 @@ public class StandardSession implements ISession, Parser.Listener, ISession.Cont { if (frameListener != null) { - logger.debug("Invoking go away callback with frame {} on listener {}", frame, frameListener); + logger.debug("Invoking callback with {} on listener {}", frame, frameListener); GoAwayInfo goAwayInfo = new GoAwayInfo(frame.getLastStreamId(), SessionStatus.from(frame.getStatusCode())); frameListener.onGoAway(this, goAwayInfo); } @@ -775,7 +775,7 @@ public class StandardSession implements ISession, Parser.Listener, ISession.Cont @Override public String toString() { - return String.format("data@%x consumed=%b on %s", hashCode(), data.isConsumed(), stream); + return String.format("DATA bytes @%x consumed=%b on %s", data.hashCode(), data.isConsumed(), stream); } } } diff --git a/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java index d5992f421b4..df543e2c18e 100644 --- a/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java +++ b/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java @@ -225,7 +225,7 @@ public class StandardStream implements IStream { if (frameListener != null) { - logger.debug("Invoking reply callback with frame {} on listener {}", synReply, frameListener); + logger.debug("Invoking reply callback with {} on listener {}", synReply, frameListener); frameListener.onReply(this, new ReplyInfo(synReply.getHeaders(), synReply.isClose())); } } @@ -242,7 +242,7 @@ public class StandardStream implements IStream { if (frameListener != null) { - logger.debug("Invoking headers callback with frame {} on listener {}", frame, frameListener); + logger.debug("Invoking headers callback with {} on listener {}", frame, frameListener); frameListener.onHeaders(this, new HeadersInfo(frame.getHeaders(), frame.isClose(), frame.isResetCompression())); } } @@ -259,7 +259,7 @@ public class StandardStream implements IStream { if (frameListener != null) { - logger.debug("Invoking data callback with frame {} on listener {}", frame, frameListener); + logger.debug("Invoking data callback with {} on listener {}", frame, frameListener); frameListener.onData(this, new ByteBufferDataInfo(data, frame.isClose(), frame.isCompress())); } } diff --git a/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java index e1f14de2cc8..569ea6bb56e 100644 --- a/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java +++ b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java @@ -82,6 +82,6 @@ public abstract class DataInfo @Override public String toString() { - return "DATA length=" + getBytesCount() + " close=" + isClose() + " compress=" + isCompress(); + return String.format("DATA @%x length=%d close=%b compress=%b", hashCode(), getBytesCount(), isClose(), isCompress()); } } diff --git a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java index 24bbcad6358..afd554c67e8 100644 --- a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java +++ b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java @@ -49,6 +49,6 @@ public abstract class ControlFrame @Override public String toString() { - return getType() + " v" + getVersion(); + return String.format("%s frame v%s", getType(), getVersion()); } } diff --git a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java index c510b0afc21..85ef85fee04 100644 --- a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java +++ b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java @@ -61,6 +61,6 @@ public class DataFrame @Override public String toString() { - return "DATA stream=" + getStreamId() + " length=" + getLength() + " close=" + isClose() + " compress=" + isCompress(); + return String.format("DATA frame stream=%d length=%d close=%b compress=%b", getStreamId(), getLength(), isClose(), isCompress()); } } diff --git a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java index f6d07558016..bda5755522f 100644 --- a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java +++ b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java @@ -44,6 +44,6 @@ public class GoAwayFrame extends ControlFrame public String toString() { SessionStatus sessionStatus = SessionStatus.from(getStatusCode()); - return super.toString() + " last_stream=" + getLastStreamId() + " status=" + (sessionStatus == null ? getStatusCode() : sessionStatus); + return String.format("%s last_stream=%d status=%s", super.toString(), getLastStreamId(), sessionStatus == null ? getStatusCode() : sessionStatus); } } diff --git a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java index cf673d2f15e..159e3c5ab77 100644 --- a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java +++ b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java @@ -71,6 +71,6 @@ public class HeadersFrame extends ControlFrame @Override public String toString() { - return super.toString() + " stream=" + getStreamId() + " close=" + isClose() + " reset_compression=" + isResetCompression(); + return String.format("%s stream=%d close=%b reset_compression=%b", super.toString(), getStreamId(), isClose(), isResetCompression()); } } diff --git a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java index f16f81f128c..aa1ac543d27 100644 --- a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java +++ b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java @@ -34,6 +34,6 @@ public class PingFrame extends ControlFrame @Override public String toString() { - return super.toString() + " ping=" + getPingId(); + return String.format("%s ping=%d", super.toString(), getPingId()); } } diff --git a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java index 176e2ae9d66..60cee7ce444 100644 --- a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java +++ b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java @@ -44,6 +44,6 @@ public class RstStreamFrame extends ControlFrame public String toString() { StreamStatus streamStatus = StreamStatus.from(getVersion(), getStatusCode()); - return super.toString() + " stream=" + getStreamId() + " status=" + (streamStatus == null ? getStatusCode() : streamStatus); + return String.format("%s stream=%d status=%s", super.toString(), getStreamId(), streamStatus == null ? getStatusCode() : streamStatus); } } diff --git a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java index a204b869623..4448dc80375 100644 --- a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java +++ b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java @@ -43,6 +43,6 @@ public class SettingsFrame extends ControlFrame @Override public String toString() { - return super.toString() + " clear_persisted=" + isClearPersisted() + " settings=" + getSettings(); + return String.format("%s clear_persisted=%b settings=%s", super.toString(), isClearPersisted(), getSettings()); } } diff --git a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java index 454baf3a5c5..0d55d1e06a0 100644 --- a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java +++ b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java @@ -49,6 +49,6 @@ public class SynReplyFrame extends ControlFrame @Override public String toString() { - return super.toString() + " stream=" + getStreamId() + " close=" + isClose(); + return String.format("%s stream=%d close=%b", super.toString(), getStreamId(), isClose()); } } diff --git a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java index 071138265ee..02dce2ff6d7 100644 --- a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java +++ b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java @@ -68,6 +68,6 @@ public class SynStreamFrame extends ControlFrame @Override public String toString() { - return super.toString() + " stream=" + getStreamId() + " close=" + isClose(); + return String.format("%s stream=%d close=%b", super.toString(), getStreamId(), isClose()); } } diff --git a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java index e7fe9c6123f..22a4129e769 100644 --- a/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java +++ b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java @@ -41,6 +41,6 @@ public class WindowUpdateFrame extends ControlFrame @Override public String toString() { - return super.toString() + " stream=" + getStreamId() + " delta=" + getWindowDelta(); + return String.format("%s stream=%d delta=%d", super.toString(), getStreamId(), getWindowDelta()); } } diff --git a/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java index 89a4d6bc15b..1fb63182fd3 100644 --- a/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java +++ b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java @@ -27,7 +27,7 @@ public class DataFrameGenerator { ByteBuffer buffer = ByteBuffer.allocateDirect(DataFrame.HEADER_LENGTH + windowSize); buffer.position(DataFrame.HEADER_LENGTH); - // Guaranteed to always be > 0 + // Guaranteed to always be >= 0 int read = dataInfo.getBytes(buffer); buffer.putInt(0, streamId & 0x7F_FF_FF_FF);