diff --git a/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java b/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java index ad360bae..b1d15aa0 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java @@ -154,7 +154,7 @@ public class GemfireTemplate extends GemfireAccessor { * Invocation handler that suppresses close calls on GemFire Regions. * @see Region#close() */ - private class CloseSuppressingInvocationHandler implements InvocationHandler { + private static class CloseSuppressingInvocationHandler implements InvocationHandler { private final Region target; diff --git a/src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java b/src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java index 1da19ef6..716036c4 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java @@ -128,7 +128,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage @Override protected void doCommit(DefaultTransactionStatus status) throws TransactionException { - CacheTransactionObject txObject = (CacheTransactionObject) status.getTransaction(); + //CacheTransactionObject txObject = (CacheTransactionObject) status.getTransaction(); if (status.isDebug()) { logger.debug("Committing Gemfire local transaction on Cache [" + cache + "]"); } @@ -145,7 +145,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage @Override protected void doRollback(DefaultTransactionStatus status) throws TransactionException { - CacheTransactionObject txObject = (CacheTransactionObject) status.getTransaction(); + //CacheTransactionObject txObject = (CacheTransactionObject) status.getTransaction(); if (status.isDebug()) { logger.debug("Rolling back Cache local transaction for [" + cache + "]"); } diff --git a/src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java b/src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java index c94b229d..0087eed8 100644 --- a/src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java +++ b/src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java @@ -37,7 +37,7 @@ import com.gemstone.gemfire.cache.Declarable; */ public class WiringDeclarableSupport extends DeclarableSupport { - private final String BEAN_NAME_PROP = "bean-name"; + private static final String BEAN_NAME_PROP = "bean-name"; @Override protected void initInstance(Properties props) { diff --git a/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java b/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java index bd43d6ca..6cfca3f5 100644 --- a/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java +++ b/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java @@ -19,6 +19,8 @@ package org.springframework.data.gemfire.serialization; import java.io.Serializable; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; @@ -81,9 +83,13 @@ public class AsmInstantiatorGenerator implements InstantiatorGenerator, Opcodes this(AsmInstantiatorGenerator.class.getClassLoader()); } - public AsmInstantiatorGenerator(ClassLoader classLoader) { + public AsmInstantiatorGenerator(final ClassLoader classLoader) { Assert.notNull(classLoader); - this.classLoader = new BytecodeClassLoader(classLoader); + this.classLoader = AccessController.doPrivileged(new PrivilegedAction() { + public BytecodeClassLoader run() { + return new BytecodeClassLoader(classLoader); + } + }); } public Instantiator getInstantiator(Class clazz, int classId) { diff --git a/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java b/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java index 1157ad13..984b2802 100644 --- a/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java @@ -77,7 +77,7 @@ public class InstantiatorFactoryBean implements BeanClassLoaderAware, FactoryBea } public Class getObjectType() { - return (list == null ? list.getClass() : Collection.class); + return (list != null ? list.getClass() : Collection.class); } public boolean isSingleton() {