junction: fix DateTime truncation issue in BlockingState mapper

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
ning · Oct 6, 2012 · a0fdf43 · a0fdf43
1 parent f0e3a01
commit a0fdf43
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/junction/src/main/java/com/ning/billing/junction/dao/BlockingStateSqlDao.java b/junction/src/main/java/com/ning/billing/junction/dao/BlockingStateSqlDao.java
@@ -96,7 +96,7 @@ public BlockingState map(final int index, final ResultSet r, final StatementCont
             final boolean blockBilling;
             final Type type;
             try {
-                timestamp = new DateTime(r.getDate("created_date"));
+                timestamp = getDateTime(r, "created_date");
                 blockableId = UUID.fromString(r.getString("id"));
                 stateName = r.getString("state") == null ? BlockingApi.CLEAR_STATE_NAME : r.getString("state");
                 type = Type.get(r.getString("type"));

diff --git a/junction/src/test/java/com/ning/billing/junction/api/blocking/TestDefaultBlockingApi.java b/junction/src/test/java/com/ning/billing/junction/api/blocking/TestDefaultBlockingApi.java
@@ -71,7 +71,7 @@ public Void withHandle(final Handle handle) throws Exception {
             }
         });
 
-        final BlockingState blockingState = new DefaultBlockingState(bundleId, "BLOCKED", Type.SUBSCRIPTION_BUNDLE, "myService", true, true, true, clock.getUTCToday().toDateTimeAtStartOfDay());
+        final BlockingState blockingState = new DefaultBlockingState(bundleId, "BLOCKED", Type.SUBSCRIPTION_BUNDLE, "myService", true, true, true, clock.getUTCNow());
         blockingApi.setBlockingState(blockingState, callContext);
 
         // Verify the blocking state was applied