felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r1560267 - /felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/OsgiLoginModuleProvider.java
Date Wed, 22 Jan 2014 07:25:47 GMT
Author: fmeschbe
Date: Wed Jan 22 07:25:47 2014
New Revision: 1560267

URL: http://svn.apache.org/r1560267
Log:
FELIX-4389 Apply patch by Tobias Bocanegra fixing field hiding issue (thanks for the patch!)

Modified:
    felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/OsgiLoginModuleProvider.java

Modified: felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/OsgiLoginModuleProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/OsgiLoginModuleProvider.java?rev=1560267&r1=1560266&r2=1560267&view=diff
==============================================================================
--- felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/OsgiLoginModuleProvider.java
(original)
+++ felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/OsgiLoginModuleProvider.java
Wed Jan 22 07:25:47 2014
@@ -50,13 +50,13 @@ final class OsgiLoginModuleProvider impl
     public void configure() {
         // FELIX-4389: Support jaas.ranking (in addition to service.ranking
         // to help ordering LoginModuleFactory instances
-        Object ranking = serviceReference.getProperty(LoginModuleFactory.JAAS_RANKING);
-        if (ranking == null) {
-            ranking = serviceReference.getProperty(Constants.SERVICE_RANKING);
+        Object rankingProperty = serviceReference.getProperty(LoginModuleFactory.JAAS_RANKING);
+        if (rankingProperty == null) {
+            rankingProperty = serviceReference.getProperty(Constants.SERVICE_RANKING);
         }
-        ranking = PropertiesUtil.toInteger(ranking, 0);
-        flag = ControlFlag.from((String) serviceReference.getProperty(LoginModuleFactory.JAAS_CONTROL_FLAG)).flag();
-        realmName = (String) serviceReference.getProperty(LoginModuleFactory.JAAS_REALM_NAME);
+        this.ranking = PropertiesUtil.toInteger(rankingProperty, 0);
+        this.flag = ControlFlag.from((String) serviceReference.getProperty(LoginModuleFactory.JAAS_CONTROL_FLAG)).flag();
+        this.realmName = (String) serviceReference.getProperty(LoginModuleFactory.JAAS_REALM_NAME);
     }
 
     public Map<String, ?> options()



Mime
View raw message