dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6613
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-04-17 11:36:45 +0300
message:
  minor fix
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java	2012-04-17 08:04:52 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java	2012-04-17 08:36:45 +0000
@@ -123,7 +123,7 @@
     {
         super.mergeWith( other );
 
-        if ( other.getClass().isInstance( other ) )
+        if ( other.getClass().isInstance( this ) )
         {
             OptionSet optionSet = (OptionSet) other;