AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Varargified log calls.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5697 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2009-03-26 00:02:19 +00:00
parent 647a25dfdc
commit 688f2580ed
46 changed files with 231 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/io/ObjectInputStream.java
+1 -1
View File
@@ -181,7 +181,7 @@ public class ObjectInputStream extends DataInputStream
Class<?> sclass = Class.forName(cname, true, _loader);
Streamer streamer = Streamer.getStreamer(sclass);
if (STREAM_DEBUG) {
log.info(hashCode() + ": New class '" + cname + "' [code=" + code + "].");
log.info(hashCode() + ": New class '" + cname + "'", "code", code);
}
// sanity check
src/java/com/threerings/io/ObjectOutputStream.java
+3 -3
View File
@@ -100,8 +100,8 @@ public class ObjectOutputStream extends DataOutputStream
// constructor because we want to be sure not to call _nextCode++ if getStreamer()
// throws an exception
if (ObjectInputStream.STREAM_DEBUG) {
log.info(hashCode() + ": Creating class mapping [code=" + _nextCode +
", class=" + sclass.getName() + "].");
log.info(hashCode() + ": Creating class mapping", "code", _nextCode,
"class", sclass.getName());
}
cmap = createClassMapping(_nextCode++, sclass, streamer);
_classmap.put(sclass, cmap);
@@ -205,7 +205,7 @@ public class ObjectOutputStream extends DataOutputStream
throw new RuntimeException("defaultWriteObject() called illegally.");
}
// log.info("Writing default [cmap=" + _streamer + ", current=" + _current + "].");
// log.info("Writing default", "cmap", _streamer, "current", _current);
// write the instance data
_streamer.writeObject(_current, this, false);
src/java/com/threerings/io/Streamer.java
+6 -7
View File
@@ -153,7 +153,7 @@ public class Streamer
if (useWriter && _writer != null) {
try {
if (ObjectInputStream.STREAM_DEBUG) {
log.info("Writing with writer [class=" + _target.getName() + "].");
log.info("Writing with writer", "class", _target.getName());
}
_writer.invoke(object, new Object[] { out });
@@ -228,8 +228,7 @@ public class Streamer
}
try {
if (ObjectInputStream.STREAM_DEBUG) {
log.info("Writing field [class=" + _target.getName() +
", field=" + field.getName() + "].");
log.info("Writing field", "class", _target.getName(), "field", field.getName());
}
fm.writeField(field, object, out);
} catch (Exception e) {
@@ -382,8 +381,8 @@ public class Streamer
if (in.available() > 0) {
fm.readField(field, object, in);
} else {
log.info("Streamed instance missing field (probably newly added) " +
"[class=" + _target.getName() + ", field=" + field.getName() + "].");
log.info("Streamed instance missing field (probably newly added)",
"class", _target.getName(), "field", field.getName());
}
} catch (Exception e) {
String errmsg = "Failure reading streamable field [class=" + _target.getName() +
@@ -427,8 +426,8 @@ public class Streamer
try {
isInner = (_target.getDeclaringClass() != null);
} catch (Throwable t) {
log.warning("Failure checking innerness of class [class=" + _target.getName() +
", error=" + t + "].");
log.warning("Failure checking innerness of class", "class", _target.getName(),
"error", t);
}
if (isInner && !isStatic) {
throw new IllegalArgumentException(