svn commit: r1673393 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java

[mduerig]

Author: mduerig
Date: Tue Apr 14 09:22:09 2015
New Revision: 1673393

URL: http://svn.apache.org/r1673393
Log:
OAK-2712: Possible null-dereference when calling ItemImpl#perform
Remove warning about raw type usages

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java?rev=1673393&r1=1673392&r2=1673393&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
 Tue Apr 14 09:22:09 2015
@@ -254,7 +254,7 @@ public class SessionDelegate {
      * @throws RepositoryException
      * @see 
#perform(org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation)
      */
-    public void performVoid(SessionOperation sessionOperation) throws 
RepositoryException {
+    public void performVoid(SessionOperation<Void> sessionOperation) throws 
RepositoryException {
         long t0 = clock.getTime();
 
         // Acquire the exclusive lock for accessing session internals.
@@ -593,7 +593,7 @@ public class SessionDelegate {
     }
 
     //-----------------------------------------------------------< internal 
>---
-    private void prePerform(@Nonnull SessionOperation op, long t0) throws 
RepositoryException {
+    private void prePerform(@Nonnull SessionOperation<?> op, long t0) throws 
RepositoryException {
         if (sessionOpCount == 0) {
             // Refresh and precondition checks only for non re-entrant
             // session operations. Don't refresh if this operation is a
@@ -609,7 +609,7 @@ public class SessionDelegate {
         }
     }
 
-    private void postPerform(@Nonnull SessionOperation op, long t0) {
+    private void postPerform(@Nonnull SessionOperation<?> op, long t0) {
         sessionCounters.accessTime = t0;
         long dt = NANOSECONDS.convert(clock.getTime() - t0, MILLISECONDS);
         sessionOpCount--;