HHH-8878 corrected id conflict in CoreMessageLogger

brmeyer · brmeyer · commit b840a9edc896 · 2014-02-26T18:55:09.000-05:00
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
@@ -1674,8 +1674,10 @@ void cannotResolveNonNullableTransientDependencies(String transientEntityString,
 					"(%2$s=true)"
 	)
 	void applyingExplicitDiscriminatorColumnForJoined(String className, String overrideSetting);
+	
+	// 458-466 reserved for use by master (ORM 5.0.0)
 
 	@LogMessage(level = DEBUG)
-	@Message(value = "Creating pooled optimizer (lo) with [incrementSize=%s; returnClass=%s]", id = 458)
+	@Message(value = "Creating pooled optimizer (lo) with [incrementSize=%s; returnClass=%s]", id = 467)
 	void creatingPooledLoOptimizer(int incrementSize, String name);
 }

Original file line number	Diff line number	Diff line change
`@@ -1674,8 +1674,10 @@ void cannotResolveNonNullableTransientDependencies(String transientEntityString,`
`1674`	`1674`	`"(%2$s=true)"`
`1675`	`1675`	`)`
`1676`	`1676`	`void applyingExplicitDiscriminatorColumnForJoined(String className, String overrideSetting);`
	`1677`	`+`
	`1678`	`+ // 458-466 reserved for use by master (ORM 5.0.0)`
`1677`	`1679`
`1678`	`1680`	`@LogMessage(level = DEBUG)`
`1679`		`- @Message(value = "Creating pooled optimizer (lo) with [incrementSize=%s; returnClass=%s]", id = 458)`
	`1681`	`+ @Message(value = "Creating pooled optimizer (lo) with [incrementSize=%s; returnClass=%s]", id = 467)`
`1680`	`1682`	`void creatingPooledLoOptimizer(int incrementSize, String name);`
`1681`	`1683`	`}`