You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2007/01/29 17:16:37 UTC
svn commit: r501088 -
/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Author: elecharny
Date: Mon Jan 29 08:16:37 2007
New Revision: 501088
URL: http://svn.apache.org/viewvc?view=rev&rev=501088
Log:
Simple reformating
Modified:
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=501088&r1=501087&r2=501088
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Mon Jan 29 08:16:37 2007
@@ -438,6 +438,7 @@
if ( !subschemaSubentryDn.toNormName().equals( base.toNormName() ) )
{
NamingEnumeration e = nextInterceptor.search( base, env, filter, searchCtls );
+
if ( searchCtls.getReturningAttributes() != null )
{
return new SearchResultFilteringEnumeration( e, new SearchControls(), invocation, topFilter );
@@ -446,10 +447,11 @@
return new SearchResultFilteringEnumeration( e, searchCtls, invocation, filters );
}
- if ( searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE && filter instanceof SimpleNode )
+ if ( ( searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE ) && ( filter instanceof SimpleNode ) )
{
SimpleNode node = ( SimpleNode ) filter;
String compareto = null;
+
if ( node.getValue() instanceof String )
{
compareto = ( String ) node.getValue();
@@ -461,7 +463,7 @@
// see if node attribute is objectClass
if ( node.getAttribute().equalsIgnoreCase( "2.5.4.0" )
- && "subschema".equalsIgnoreCase( compareto ) && node.getAssertionType() == SimpleNode.EQUALITY )
+ && "subschema".equalsIgnoreCase( compareto ) && ( node.getAssertionType() == SimpleNode.EQUALITY ) )
{
// call.setBypass( true );
Attributes attrs = getSubschemaEntry( searchCtls.getReturningAttributes() );
@@ -469,7 +471,7 @@
return new SingletonEnumeration( result );
}
}
- else if ( searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE && filter instanceof PresenceNode )
+ else if ( ( searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE ) && ( filter instanceof PresenceNode ) )
{
PresenceNode node = ( PresenceNode ) filter;
@@ -484,6 +486,7 @@
}
NamingEnumeration e = nextInterceptor.search( base, env, filter, searchCtls );
+
if ( searchCtls.getReturningAttributes() != null )
{
return new SearchResultFilteringEnumeration( e, searchCtls, invocation, topFilter );