You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/09/14 21:20:56 UTC
svn commit: r997049 - in /karaf/trunk:
assembly/src/main/distribution/text/etc/
jaas/modules/src/main/java/org/apache/karaf/jaas/modules/
jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/
Author: gnodet
Date: Tue Sep 14 19:20:56 2010
New Revision: 997049
URL: http://svn.apache.org/viewvc?rev=997049&view=rev
Log:
Minor modifications
Modified:
karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
Modified: karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg?rev=997049&r1=997048&r2=997049&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg (original)
+++ karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg Tue Sep 14 19:20:56 2010
@@ -27,4 +27,4 @@
# SHA-384
# SHA-512
#
-#encryption=MD5
\ No newline at end of file
+#encryption=MD5
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java?rev=997049&r1=997048&r2=997049&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java Tue Sep 14 19:20:56 2010
@@ -102,7 +102,7 @@ public abstract class AbstractKarafLogin
LOG.debug("Encryption is enabled and use " + encryption + " encryption algorithm.");
}
// lookup the encryption service reference
- ServiceReference[] encryptionServiceReferences = new ServiceReference[0];
+ ServiceReference[] encryptionServiceReferences;
try {
encryptionServiceReferences = bundleContext.getServiceReferences(Encryption.class.getName(), "(algorithm=" + encryption + ")");
} catch (InvalidSyntaxException e) {
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java?rev=997049&r1=997048&r2=997049&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java Tue Sep 14 19:20:56 2010
@@ -134,6 +134,7 @@ public class PropertiesLoginModule exten
LOG.debug("Store the users properties file.");
}
// TODO use Karaf Properties (to maintain comments, etc)
+ // TODO close the stream to avoid leaks
users.store(new FileOutputStream(f), null);
} catch (IOException ioe) {
LOG.warn("Unable to write user properties file " + f, ioe);