diff options
| -rw-r--r-- | juick-core/src/main/java/com/juick/xml/adapters/SimpleDateAdapter.java | 2 | ||||
| -rw-r--r-- | juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/juick-core/src/main/java/com/juick/xml/adapters/SimpleDateAdapter.java b/juick-core/src/main/java/com/juick/xml/adapters/SimpleDateAdapter.java index 264f8c22..1093e47a 100644 --- a/juick-core/src/main/java/com/juick/xml/adapters/SimpleDateAdapter.java +++ b/juick-core/src/main/java/com/juick/xml/adapters/SimpleDateAdapter.java @@ -21,7 +21,7 @@ public class SimpleDateAdapter extends XmlAdapter<String, Date> { @Override public String marshal(Date v) throws Exception { if (v == null) { - return ""; + return null; } synchronized (dateFormat) { return dateFormat.format(v); diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java index 9400aad7..5af00329 100644 --- a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java +++ b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java @@ -133,6 +133,7 @@ public class ConnectionRouter extends Connection implements Runnable { logger.warn("STREAM ROUTER FINISHED"); } catch (Exception e) { logger.warn("router error, reconnection " + e.toString()); + execution.recordFailure(e); } } }); |