diff --git a/util/src/main/java/org/killbill/billing/util/tag/DefaultTagDefinition.java b/util/src/main/java/org/killbill/billing/util/tag/DefaultTagDefinition.java
index 48383fe..05ca6b4 100644
--- a/util/src/main/java/org/killbill/billing/util/tag/DefaultTagDefinition.java
+++ b/util/src/main/java/org/killbill/billing/util/tag/DefaultTagDefinition.java
@@ -135,7 +135,7 @@ public class DefaultTagDefinition extends EntityBase implements TagDefinition {
private static List<ObjectType> getApplicableObjectTypes(final UUID id, final Boolean isControlTag) {
if (!isControlTag) {
- return ImmutableList.<ObjectType>of();
+ return ImmutableList.<ObjectType>copyOf(ObjectType.values());
}
for (final ControlTagType cur : ControlTagType.values()) {
if (cur.getId().equals(id)) {
diff --git a/util/src/test/java/org/killbill/billing/util/tag/TestDefaultTagDefinition.java b/util/src/test/java/org/killbill/billing/util/tag/TestDefaultTagDefinition.java
index 59aaf26..d030b62 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/TestDefaultTagDefinition.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/TestDefaultTagDefinition.java
@@ -19,19 +19,23 @@ package org.killbill.billing.util.tag;
import java.util.UUID;
+import org.killbill.billing.ObjectType;
import org.killbill.billing.util.UtilTestSuiteNoDB;
import org.killbill.billing.util.api.TagApiException;
import org.killbill.billing.util.api.TagDefinitionApiException;
import org.testng.Assert;
import org.testng.annotations.Test;
+import com.google.common.collect.ImmutableList;
+
public class TestDefaultTagDefinition extends UtilTestSuiteNoDB {
@Test(groups = "fast")
public void testDefaultTagDefinition() throws TagApiException, TagDefinitionApiException {
final DefaultTagDefinition def1 = new DefaultTagDefinition(UUID.randomUUID(), "foo", "nothing", false);
- Assert.assertTrue(def1.getApplicableObjectTypes().isEmpty());
+ Assert.assertFalse(def1.getApplicableObjectTypes().isEmpty());
+ Assert.assertEquals(ImmutableList.<ObjectType>copyOf(ObjectType.values()), def1.getApplicableObjectTypes());
for (final ControlTagType cur : ControlTagType.values()) {
