[hibernate-commits] Hibernate SVN: r15588 - in core/patches/JBOSS_EAP_3_2_4_SP1_CP01_JBPAPP-1433: src/org/hibernate/cfg and 1 other directories.
Author: dstephan
Date: 2008-11-19 03:18:58 -0500 (Wed, 19 Nov 2008)
New Revision: 15588
Modified:
core/patches/JBOSS_EAP_3_2_4_SP1_CP01_JBPAPP-1433/build.xml
core/patches/JBOSS_EAP_3_2_4_SP1_CP01_JBPAPP-1433/src/org/hibernate/cfg/Environment.java
core/patches/JBOSS_EAP_3_2_4_SP1_CP01_JBPAPP-1433/src/org/hibernate/persister/entity/AbstractEntityPersister.java
Log:
Backported change from JBPAPP-1259.
Modified: core/patches/JBOSS_EAP_3_2_4_SP1_CP01_JBPAPP-1433/build.xml
===================================================================
--- core/patches/JBOSS_EAP_3_2_4_SP1_CP01_JBPAPP-1433/build.xml 2008-11-19 05:26:06 UTC
(rev 15587)
+++ core/patches/JBOSS_EAP_3_2_4_SP1_CP01_JBPAPP-1433/build.xml 2008-11-19 08:18:58 UTC
(rev 15588)
@@ -23,7 +23,7 @@
<property name="version.major" value="3"/>
<property name="version.minor" value="2"/>
<property name="version.micro" value="4"/>
- <property name="version.qualifier" value="sp1"/>
+ <property name="version.qualifier"
value="sp1.JBPAPP-1433"/>
<property name="version.full"
value="${version.major}.${version.minor}.${version.micro}.${version.qualifier}"/>
<property name="version.major_minor"
value="${version.major}.${version.minor}"/>
<property name="fullname"
value="${name}-${version.full}"/>
Modified:
core/patches/JBOSS_EAP_3_2_4_SP1_CP01_JBPAPP-1433/src/org/hibernate/cfg/Environment.java
===================================================================
---
core/patches/JBOSS_EAP_3_2_4_SP1_CP01_JBPAPP-1433/src/org/hibernate/cfg/Environment.java 2008-11-19
05:26:06 UTC (rev 15587)
+++
core/patches/JBOSS_EAP_3_2_4_SP1_CP01_JBPAPP-1433/src/org/hibernate/cfg/Environment.java 2008-11-19
08:18:58 UTC (rev 15588)
@@ -153,7 +153,7 @@
*/
public final class Environment {
- public static final String VERSION = "3.2.4.sp1";
+ public static final String VERSION = "3.2.4.sp1.JBPAPP-1433";
/**
* <tt>ConnectionProvider</tt> implementor to use when obtaining
connections
Modified:
core/patches/JBOSS_EAP_3_2_4_SP1_CP01_JBPAPP-1433/src/org/hibernate/persister/entity/AbstractEntityPersister.java
===================================================================
---
core/patches/JBOSS_EAP_3_2_4_SP1_CP01_JBPAPP-1433/src/org/hibernate/persister/entity/AbstractEntityPersister.java 2008-11-19
05:26:06 UTC (rev 15587)
+++
core/patches/JBOSS_EAP_3_2_4_SP1_CP01_JBPAPP-1433/src/org/hibernate/persister/entity/AbstractEntityPersister.java 2008-11-19
08:18:58 UTC (rev 15588)
@@ -3088,7 +3088,7 @@
propsToUpdate[property] = true;
}
}
- if ( isVersioned() ) {
+ if ( isVersioned() && updateability[getVersionProperty() ]) {
propsToUpdate[ getVersionProperty() ] =
Versioning.isVersionIncrementRequired( dirtyProperties, hasDirtyCollection,
getPropertyVersionability() );
}