You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by jc...@apache.org on 2013/08/02 15:36:59 UTC
svn commit: r1509701 - in
/commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider:
ProviderDecorator.java SingletonProvider.java
Author: jcarman
Date: Fri Aug 2 13:36:59 2013
New Revision: 1509701
URL: http://svn.apache.org/r1509701
Log:
Fixing Sonar issues.
Modified:
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/ProviderDecorator.java
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/SingletonProvider.java
Modified: commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/ProviderDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/ProviderDecorator.java?rev=1509701&r1=1509700&r2=1509701&view=diff
==============================================================================
--- commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/ProviderDecorator.java (original)
+++ commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/ProviderDecorator.java Fri Aug 2 13:36:59 2013
@@ -29,31 +29,32 @@ import org.apache.commons.proxy2.ObjectP
*/
public class ProviderDecorator<T> implements ObjectProvider<T>
{
- //**********************************************************************************************************************
- // Fields
- //**********************************************************************************************************************
+//----------------------------------------------------------------------------------------------------------------------
+// Fields
+//----------------------------------------------------------------------------------------------------------------------
/**
* The wrapped {@link ObjectProvider}.
*/
- protected ObjectProvider<? extends T> inner;
+ private ObjectProvider<? extends T> inner;
- //**********************************************************************************************************************
- // Constructors
- //**********************************************************************************************************************
+//----------------------------------------------------------------------------------------------------------------------
+// Constructors
+//----------------------------------------------------------------------------------------------------------------------
/**
* Create a new ProviderDecorator instance.
+ *
* @param inner
*/
- public ProviderDecorator( ObjectProvider<? extends T> inner )
+ public ProviderDecorator(ObjectProvider<? extends T> inner)
{
this.inner = inner;
}
- //**********************************************************************************************************************
- // ObjectProvider Implementation
- //**********************************************************************************************************************
+//----------------------------------------------------------------------------------------------------------------------
+// ObjectProvider Implementation
+//----------------------------------------------------------------------------------------------------------------------
/**
* {@inheritDoc}
@@ -62,4 +63,18 @@ public class ProviderDecorator<T> implem
{
return inner.getObject();
}
+
+//----------------------------------------------------------------------------------------------------------------------
+// Getter/Setter Methods
+//----------------------------------------------------------------------------------------------------------------------
+
+ protected ObjectProvider<? extends T> getInner()
+ {
+ return inner;
+ }
+
+ public void setInner(ObjectProvider<? extends T> inner)
+ {
+ this.inner = inner;
+ }
}
Modified: commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/SingletonProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/SingletonProvider.java?rev=1509701&r1=1509700&r2=1509701&view=diff
==============================================================================
--- commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/SingletonProvider.java (original)
+++ commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/SingletonProvider.java Fri Aug 2 13:36:59 2013
@@ -40,9 +40,10 @@ public class SingletonProvider<T> extend
/**
* Create a new SingletonProvider instance.
+ *
* @param inner
*/
- public SingletonProvider( ObjectProvider<? extends T> inner )
+ public SingletonProvider(ObjectProvider<? extends T> inner)
{
super(inner);
}
@@ -56,13 +57,13 @@ public class SingletonProvider<T> extend
*/
public T getObject()
{
- synchronized( this )
+ synchronized (this)
{
- if( instance == null )
+ if (instance == null)
{
instance = super.getObject();
// Garbage collection
- inner = null;
+ setInner(null);
}
return instance;
}