Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4081] branches/openutils-bshd5-backport
|
From: <gca...@us...> - 2012-06-29 16:29:16
|
Revision: 4081
http://openutils.svn.sourceforge.net/openutils/?rev=4081&view=rev
Author: gcatania
Date: 2012-06-29 16:29:10 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Merged revisions 4080 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5
........
r4080 | gcatania | 2012-06-29 18:27:22 +0200 (Fri, 29 Jun 2012) | 1 line
fix filter metadata support
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4080&view=rev
Modified Paths:
--------------
branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
Property Changed:
----------------
branches/openutils-bshd5-backport/
branches/openutils-bshd5-backport/pom.xml
branches/openutils-bshd5-backport/src/
Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
- /trunk/openutils-bshd5:1-4040,4042-4056,4058-4078
+ /trunk/openutils-bshd5:1-4040,4042-4056,4058-4080
Modified: svn:mergeinfo
- /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*
+ /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*
Property changes on: branches/openutils-bshd5-backport/pom.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/openutils-bshd5/pom.xml:4045-4047,4059,4069-4070,4073,4075-4078
+ /trunk/openutils-bshd5/pom.xml:4045-4047,4059,4069-4070,4073,4075-4078,4080
Property changes on: branches/openutils-bshd5-backport/src
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078
+ /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080
Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2012-06-29 16:27:22 UTC (rev 4080)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2012-06-29 16:29:10 UTC (rev 4081)
@@ -130,7 +130,7 @@
}
Object propertyValue = classMetadata.getPropertyValue(entity, propertyName, entityMode);
FilterMetadata fm = currFilterMetadata.get(propertyName);
- if (fm != null)
+ if (fm != null && propertyValue != null)
{
fm.createFilter(crit, propertyName, propertyValue);
continue;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
