directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r558631 - /directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/DifferenceEngine.java
Date Mon, 23 Jul 2007 07:22:13 GMT
Author: pamarcelot
Date: Mon Jul 23 00:22:13 2007
New Revision: 558631

URL: http://svn.apache.org/viewvc?view=rev&rev=558631
Log:
Fixed a bug in the DifferenceEngine. The wrong schema (which was null) was used, causing an
NPE.

Modified:
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/DifferenceEngine.java

Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/DifferenceEngine.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/DifferenceEngine.java?view=diff&rev=558631&r1=558630&r2=558631
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/DifferenceEngine.java
(original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/DifferenceEngine.java
Mon Jul 23 00:22:13 2007
@@ -78,14 +78,14 @@
                 differences.add( schemaDifference );
 
                 // Adding attribute types
-                for ( AttributeTypeImpl at : schemaFromL2.getAttributeTypes() )
+                for ( AttributeTypeImpl at : schemaFromL1.getAttributeTypes() )
                 {
                     schemaDifference.addAttributeTypeDifference( new AttributeTypeDifference(
null, at,
                         DifferenceType.REMOVED ) );
                 }
 
                 // Adding object classes
-                for ( ObjectClassImpl oc : schemaFromL2.getObjectClasses() )
+                for ( ObjectClassImpl oc : schemaFromL1.getObjectClasses() )
                 {
                     schemaDifference.addObjectClassDifference( new ObjectClassDifference(
null, oc,
                         DifferenceType.REMOVED ) );



Mime
View raw message