directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erodrig...@apache.org
Subject svn commit: r396978 - /directory/trunks/apacheds/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java
Date Tue, 25 Apr 2006 20:37:36 GMT
Author: erodriguez
Date: Tue Apr 25 13:37:33 2006
New Revision: 396978

URL: http://svn.apache.org/viewcvs?rev=396978&view=rev
Log:
Updated to use convention in protocol providers of working with attributes as Strings, since
they are going to come from JNDI thay way.

Modified:
    directory/trunks/apacheds/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java

Modified: directory/trunks/apacheds/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java?rev=396978&r1=396977&r2=396978&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java (original)
+++ directory/trunks/apacheds/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java Tue
Apr 25 13:37:33 2006
@@ -32,8 +32,8 @@
     public static String LDAP_PORT_KEY = "ldap.port";
     public static String LDAPS_PORT_KEY = "ldaps.port";
 
-    private static int LDAP_PORT_DEFAULT = 389;
-    private static int LDAPS_PORT_DEFAULT = 636;
+    private static String LDAP_PORT_DEFAULT = "389";
+    private static String LDAPS_PORT_DEFAULT = "636";
 
     private static String SERVICE_PID = "service.pid";
     private static String PID = "org.apache.ldap";
@@ -114,7 +114,7 @@
             return Integer.parseInt( get( key ) );
         }
 
-        return LDAP_PORT_DEFAULT;
+        return Integer.parseInt( LDAP_PORT_DEFAULT );
     }
 
     public int getSecurePort()
@@ -126,7 +126,7 @@
             return Integer.parseInt( get( key ) );
         }
 
-        return LDAPS_PORT_DEFAULT;
+        return Integer.parseInt( LDAPS_PORT_DEFAULT );
     }
 
     public static Map getDefaultConfig()
@@ -134,8 +134,8 @@
         Map defaults = new HashMap();
 
         defaults.put( SERVICE_PID, PID );
-        defaults.put( LDAP_PORT_KEY, Integer.getInteger( LDAP_PORT_KEY, new Integer( LDAP_PORT_DEFAULT
) ) );
-        defaults.put( LDAPS_PORT_KEY, Integer.getInteger( LDAPS_PORT_KEY, new Integer( LDAPS_PORT_DEFAULT
) ) );
+        defaults.put( LDAP_PORT_KEY, LDAP_PORT_DEFAULT );
+        defaults.put( LDAPS_PORT_KEY, LDAPS_PORT_DEFAULT );
 
         return defaults;
     }



Mime
View raw message