Fixed NPE.

Author: atsticks

src/main/java/javax/money/AbstractQuery.java

@@ -98,7 +98,7 @@ public Long getTimestampMillis() {
      * @return the current timestamp, or null.
      */
     public TemporalAccessor getTimestamp() {
-        Object value = get(KEY_QUERY_TIMESTAMP, null);
+        Object value = get(KEY_QUERY_TIMESTAMP, Object.class);
         if (value instanceof TemporalAccessor) {
             return (TemporalAccessor) value;
         } else if (value instanceof Long) {

src/test/java/javax/money/AbstractContextTest.java

@@ -109,7 +109,7 @@ public void testGetKeys() {
         Set<String> keys = ctx.getKeys(String.class);
         assertNotNull(keys);
         assertFalse(keys.isEmpty());
-        assertEquals(String.class, keys.iterator().next());
+        assertEquals(String.class.getName(), keys.iterator().next());
         keys = ctx.getKeys(Integer.class);
         assertNotNull(keys);
         assertTrue(keys.size() == 2);