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 2006/12/11 05:50:20 UTC
svn commit: r485501 - in
/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree:
BTreePartition.java jdbm/JdbmPartition.java
Author: akarasulu
Date: Sun Dec 10 20:50:19 2006
New Revision: 485501
URL: http://svn.apache.org/viewvc?view=rev&rev=485501
Log:
making BTreePartitionConfiguration a protected member in superclass
Modified:
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?view=diff&rev=485501&r1=485500&r2=485501
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Sun Dec 10 20:50:19 2006
@@ -69,6 +69,7 @@
private SearchEngine searchEngine = null;
private Optimizer optimizer = new NoOpOptimizer();
+ protected BTreePartitionConfiguration btpConfig;
protected AttributeTypeRegistry attributeTypeRegistry = null;
protected OidRegistry oidRegistry = null;
@@ -106,8 +107,8 @@
public void init( DirectoryServiceConfiguration factoryCfg, PartitionConfiguration cfg )
throws NamingException
{
- BTreePartitionConfiguration btConfig = BTreePartitionConfiguration.convert( cfg );
- if ( btConfig.isOptimizerEnabled() )
+ this.btpConfig = BTreePartitionConfiguration.convert( cfg );
+ if ( this.btpConfig.isOptimizerEnabled() )
{
optimizer = new DefaultOptimizer( this );
}
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?view=diff&rev=485501&r1=485500&r2=485501
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Sun Dec 10 20:50:19 2006
@@ -112,8 +112,6 @@
/** a system index on aliasedObjectName attribute */
private Index aliasIdx;
- private BTreePartitionConfiguration cfg;
-
private static AttributeType OBJECT_CLASS_AT;
private static AttributeType ALIAS_AT;
@@ -135,11 +133,11 @@
{
if ( cfg instanceof BTreePartitionConfiguration )
{
- this.cfg = ( BTreePartitionConfiguration ) cfg;
+ btpConfig = ( BTreePartitionConfiguration ) cfg;
}
else
{
- this.cfg = MutableBTreePartitionConfiguration.getConfiguration( cfg );
+ btpConfig = MutableBTreePartitionConfiguration.getConfiguration( cfg );
}
oidRegistry = factoryCfg.getGlobalRegistries().getOidRegistry();
@@ -872,7 +870,7 @@
master.put( entry, id );
- if ( cfg.isSynchOnWrite() )
+ if ( btpConfig.isSynchOnWrite() )
{
sync();
}
@@ -931,7 +929,7 @@
master.delete( id );
- if ( cfg.isSynchOnWrite() )
+ if ( btpConfig.isSynchOnWrite() )
{
sync();
}
@@ -1276,7 +1274,7 @@
master.put( entry, id );
- if ( cfg.isSynchOnWrite() )
+ if ( btpConfig.isSynchOnWrite() )
{
sync();
}
@@ -1310,7 +1308,7 @@
master.put( entry, id );
- if ( cfg.isSynchOnWrite() )
+ if ( btpConfig.isSynchOnWrite() )
{
sync();
}
@@ -1435,7 +1433,7 @@
newUpdn.add( newUpdn.size(), newRdn ); // add da new upRdn
modifyDn( id, newUpdn, false ); // propagate dn changes
- if ( cfg.isSynchOnWrite() )
+ if ( btpConfig.isSynchOnWrite() )
{
sync();
}
@@ -1520,7 +1518,7 @@
modifyRn( oldChildDn, newRdn, deleteOldRdn );
move( oldChildDn, childId, newParentDn );
- if ( cfg.isSynchOnWrite() )
+ if ( btpConfig.isSynchOnWrite() )
{
sync();
}
@@ -1532,7 +1530,7 @@
BigInteger childId = getEntryId( oldChildDn.toString() );
move( oldChildDn, childId, newParentDn );
- if ( cfg.isSynchOnWrite() )
+ if ( btpConfig.isSynchOnWrite() )
{
sync();
}