提交 3d518137 编写于 作者: F Frankie Wu

apply waterfall to all logivew

上级 9f3fd414
......@@ -60,12 +60,24 @@ public class HistoricalLogViewService extends BaseHistoricalModelService<String>
if (tree != null) {
ChannelBuffer buf = ChannelBuffers.dynamicBuffer(8192);
m_codec.encode(tree, buf);
buf.readInt(); // get rid of length
return buf.toString(Charset.forName("utf-8"));
} else {
return null;
if (request.getProperty("waterfall", "false").equals("true")) {
// to work around a plexus injection bug
MessageCodec codec = lookup(MessageCodec.class, "waterfall");
codec.encode(tree, buf);
} else {
m_codec.encode(tree, buf);
}
try {
buf.readInt(); // get rid of length
return buf.toString(Charset.forName("utf-8"));
} catch (Exception e) {
// ignore it
}
}
return null;
}
@Override
......
......@@ -80,7 +80,13 @@ public class HistoricalMessageService extends BaseLocalModelService<String> {
m_codec.encode(tree, buf);
}
buf.readInt(); // get rid of length
return buf.toString(Charset.forName("utf-8"));
try {
buf.readInt(); // get rid of length
return buf.toString(Charset.forName("utf-8"));
} catch (Exception e) {
// ignore it
}
return null;
}
}
......@@ -77,12 +77,24 @@ public class LocalLogViewService extends BaseLocalModelService<String> {
if (tree != null) {
ChannelBuffer buf = ChannelBuffers.dynamicBuffer(8192);
m_codec.encode(tree, buf);
buf.readInt(); // get rid of length
return buf.toString(Charset.forName("utf-8"));
} else {
return null;
if (request.getProperty("waterfall", "false").equals("true")) {
// to work around a plexus injection bug
MessageCodec codec = lookup(MessageCodec.class, "waterfall");
codec.encode(tree, buf);
} else {
m_codec.encode(tree, buf);
}
try {
buf.readInt(); // get rid of length
return buf.toString(Charset.forName("utf-8"));
} catch (Exception e) {
// ignore it
}
}
return null;
}
@Override
......
......@@ -52,9 +52,8 @@ public class LocalMessageService extends BaseLocalModelService<String> {
buf.readInt(); // get rid of length
return buf.toString(Charset.forName("utf-8"));
} catch (Exception e) {
// ignore it
}
return null;
}
return null;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册