felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject svn commit: r1782464 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java
Date Fri, 10 Feb 2017 13:10:03 GMT
Author: pauls
Date: Fri Feb 10 13:10:02 2017
New Revision: 1782464

URL: http://svn.apache.org/viewvc?rev=1782464&view=rev
Log:
Replace some tabs with spaces (urgs).

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java?rev=1782464&r1=1782463&r2=1782464&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java Fri
Feb 10 13:10:02 2017
@@ -292,8 +292,8 @@ public class ServiceRegistry
     @SuppressWarnings("unchecked")
     public <S> S getService(final Bundle bundle, final ServiceReference<S> ref,
final boolean isServiceObjects)
     {
-    	// prototype scope is only possible if called from ServiceObjects
-    	final boolean isPrototype = isServiceObjects && ref.getProperty(Constants.SERVICE_SCOPE)
== Constants.SCOPE_PROTOTYPE;
+        // prototype scope is only possible if called from ServiceObjects
+        final boolean isPrototype = isServiceObjects && ref.getProperty(Constants.SERVICE_SCOPE)
== Constants.SCOPE_PROTOTYPE;
         UsageCount usage = null;
         Object svcObj = null;
 
@@ -471,20 +471,20 @@ public class ServiceRegistry
                         {
                             if (usage.m_svcHolderRef.compareAndSet(holder, null))
                             {
-                            	// Temporarily increase the usage again so that the 
-                            	// service factory still sees the usage in the unget
-                            	usage.m_count.incrementAndGet();
-                            	try
-                            	{
-	                                // Remove reference from usages array.
-	                                ((ServiceRegistrationImpl.ServiceReferenceImpl) ref)
-	                                    .getRegistration().ungetService(bundle, svc);
-                            	}
-                            	finally 
-                            	{
-                            		// now we can decrease the usage again
-                            		usage.m_count.decrementAndGet();
-                            	}
+                                // Temporarily increase the usage again so that the 
+                                // service factory still sees the usage in the unget
+                                usage.m_count.incrementAndGet();
+                                try
+                                {
+                                    // Remove reference from usages array.
+                                    ((ServiceRegistrationImpl.ServiceReferenceImpl) ref)
+                                        .getRegistration().ungetService(bundle, svc);
+                                }
+                                finally 
+                                {
+                                    // now we can decrease the usage again
+                                    usage.m_count.decrementAndGet();
+                                }
 
                             }
                         }



Mime
View raw message