From f9c16f5cba4ee066a74dec4849862617a61a294f Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 2 Jun 2010 05:55:27 +0000
Subject: [PATCH] LMS-1535 test fixed
SVN: 16249
---
.../generic/server/business/bo/EntityTypePropertyTypeBO.java | 2 +-
.../server/business/bo/EntityTypePropertyTypeBOTest.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBO.java
index 1d818e5238b..236d79a9adb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBO.java
+++ b/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())
{
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBOTest.java
index 07d0e98283b..9b9aa8f255b 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBOTest.java
+++ b/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));
--
GitLab