You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2015/03/27 21:42:33 UTC

svn commit: r1669680 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java

Author: reschke
Date: Fri Mar 27 20:42:33 2015
New Revision: 1669680

URL: http://svn.apache.org/r1669680
Log:
OAK-1266 - fix warnings

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1669680&r1=1669679&r2=1669680&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Fri Mar 27 20:42:33 2015
@@ -1025,7 +1025,7 @@ public class RDBDocumentStore implements
                 }
                 if (success) {
                     for (Entry<String, NodeDocument> entry : cachedDocs.entrySet()) {
-                        T oldDoc = (T) (entry.getValue());
+                        T oldDoc = castAsT(entry.getValue());
                         if (oldDoc == null) {
                             // make sure concurrently loaded document is
                             // invalidated
@@ -1113,7 +1113,7 @@ public class RDBDocumentStore implements
                 if (lastmodcount == row.getModcount()) {
                     // we can re-use the cached document
                     cachedDoc.markUpToDate(System.currentTimeMillis());
-                    return (T) cachedDoc;
+                    return castAsT(cachedDoc);
                 } else {
                     return SR.fromRow(collection, row);
                 }
@@ -1790,7 +1790,7 @@ public class RDBDocumentStore implements
             if (modCount.longValue() <= cachedModCount.longValue()) {
                 // we can use the cached document
                 inCache.markUpToDate(now);
-                return (T) inCache;
+                return castAsT(inCache);
             }
         }
 
@@ -1817,7 +1817,7 @@ public class RDBDocumentStore implements
         } finally {
             lock.unlock();
         }
-        return (T) fresh;
+        return castAsT(fresh);
     }
 
     private boolean hasChangesToCollisions(UpdateOp update) {