You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2005/03/29 01:19:48 UTC
svn commit: r159329 - in
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol:
AddHandler.java CompareHandler.java DeleteHandler.java ModifyDnHandler.java
ModifyHandler.java SearchHandler.java SessionRegistry.java UnbindHandler.java
Author: akarasulu
Date: Mon Mar 28 15:19:45 2005
New Revision: 159329
URL: http://svn.apache.org/viewcvs?view=rev&rev=159329
Log:
class cast exception fixed
Modified:
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AddHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/CompareHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/DeleteHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyDnHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SearchHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SessionRegistry.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/UnbindHandler.java
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AddHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AddHandler.java?view=diff&r1=159328&r2=159329
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AddHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AddHandler.java Mon Mar 28 15:19:45 2005
@@ -47,7 +47,7 @@
try
{
InitialLdapContext ictx = SessionRegistry.getSingleton()
- .getInitialLdapContext( session, null, true );
+ .getLdapContext( session, null, true );
LdapContext ctx = ( LdapContext ) ictx.lookup( "" );
ctx.createSubcontext( req.getName(), req.getEntry() );
}
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/CompareHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/CompareHandler.java?view=diff&r1=159328&r2=159329
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/CompareHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/CompareHandler.java Mon Mar 28 15:19:45 2005
@@ -50,7 +50,7 @@
try
{
InitialLdapContext ictx = SessionRegistry.getSingleton()
- .getInitialLdapContext( session, null, true );
+ .getLdapContext( session, null, true );
DirContext ctx = ( DirContext ) ictx.lookup( "" );
Attribute attr = ctx.getAttributes( req.getName() ).get( req.getAttributeId() );
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/DeleteHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/DeleteHandler.java?view=diff&r1=159328&r2=159329
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/DeleteHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/DeleteHandler.java Mon Mar 28 15:19:45 2005
@@ -47,7 +47,7 @@
try
{
InitialLdapContext ictx = SessionRegistry.getSingleton()
- .getInitialLdapContext( session, null, true );
+ .getLdapContext( session, null, true );
DirContext ctx = ( DirContext ) ictx.lookup( "" );
ctx.destroySubcontext( req.getName() );
}
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyDnHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyDnHandler.java?view=diff&r1=159328&r2=159329
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyDnHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyDnHandler.java Mon Mar 28 15:19:45 2005
@@ -50,7 +50,7 @@
try
{
InitialLdapContext ictx = SessionRegistry.getSingleton()
- .getInitialLdapContext( session, null, true );
+ .getLdapContext( session, null, true );
DirContext ctx = ( DirContext ) ictx.lookup( "" );
String deleteRDN = String.valueOf( req.getDeleteOldRdn() );
ctx.addToEnvironment( "java.naming.ldap.deleteRDN", deleteRDN );
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyHandler.java?view=diff&r1=159328&r2=159329
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyHandler.java Mon Mar 28 15:19:45 2005
@@ -52,7 +52,7 @@
try
{
InitialLdapContext ictx = SessionRegistry.getSingleton()
- .getInitialLdapContext( session, null, true );
+ .getLdapContext( session, null, true );
DirContext ctx = ( DirContext ) ictx.lookup( "" );
Object[] mods = req.getModificationItems().toArray( EMPTY );
ctx.modifyAttributes( req.getName(), ( ModificationItem[] ) mods );
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SearchHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SearchHandler.java?view=diff&r1=159328&r2=159329
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SearchHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SearchHandler.java Mon Mar 28 15:19:45 2005
@@ -91,7 +91,7 @@
try
{
InitialLdapContext ictx = SessionRegistry.getSingleton()
- .getInitialLdapContext( session, null, true );
+ .getLdapContext( session, null, true );
ctx = ( LdapContext ) ictx.lookup( "" );
ctx.addToEnvironment( DEREFALIASES_KEY, req.getDerefAliases()
.getName() );
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SessionRegistry.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SessionRegistry.java?view=diff&r1=159328&r2=159329
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SessionRegistry.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SessionRegistry.java Mon Mar 28 15:19:45 2005
@@ -125,14 +125,14 @@
* InitialContext if one is not present for the operation
* @return the InitialContext or null
*/
- public LdapContext getInitialLdapContext( ProtocolSession session, Control[] connCtls, boolean allowAnonymous )
+ public LdapContext getLdapContext( ProtocolSession session, Control[] connCtls, boolean allowAnonymous )
throws NamingException
{
LdapContext ctx = null;
synchronized( contexts )
{
- ctx = ( InitialLdapContext ) contexts.get( session );
+ ctx = ( LdapContext ) contexts.get( session );
}
if ( ctx == null && allowAnonymous )
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/UnbindHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/UnbindHandler.java?view=diff&r1=159328&r2=159329
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/UnbindHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/UnbindHandler.java Mon Mar 28 15:19:45 2005
@@ -40,7 +40,7 @@
try
{
InitialLdapContext ictx = SessionRegistry.getSingleton()
- .getInitialLdapContext( session, null, false );
+ .getLdapContext( session, null, false );
if ( ictx != null )
{
ictx.close();