killbill-memoizeit

junction: fix DateTime truncation issue in BlockingState

10/5/2012 9:09:43 PM

Details

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
index 45bae02..9279bcb 100644
--- 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 interface BlockingStateSqlDao extends BlockingStateDao, CloseMe, Transmog
             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
index f2552c6..ba467bd 100644
--- 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 class TestDefaultBlockingApi extends JunctionTestSuiteWithEmbeddedDB {
             }
         });
 
-        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