LMS-1535 test fixed

SVN: 16249

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBO.java

@@ -159,7 +159,7 @@ public class EntityTypePropertyTypeBO extends AbstractBusinessObject implements
                             defaultValue);
             for (int i = 0; i < entities.size(); i++)
             {
-                if (i % 1000 == 0)
+                if (i > 0 && i % 1000 == 0)
                 {
                     if (operationLog.isDebugEnabled())
                     {

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBOTest.java

@@ -118,6 +118,9 @@ public final class EntityTypePropertyTypeBOTest extends AbstractBOTest
         context.checking(new Expectations()
             {
                 {
+                    one(daoFactory).setBatchUpdateMode(true);
+                    one(daoFactory).setBatchUpdateMode(false);
+                    
                     one(entityPropertyTypeDAO).tryFindAssignment(experimentType, propertyType);
                     will(returnValue(null));