Re: svn commit: r661090 - /openjpa/branches/1.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java

[Kevin Sutter <kw...@gmail.com>]

Abe,
Now that the 1.1.0 release has completed, weren't we going to keep the 1.1.x
branch in synch with trunk?  That is, any changes that go into a service
branch should also apply to trunk.  But, not necessarily vice versa.  Or,
was this change already part of trunk?

Thanks,
Kevin

On Wed, May 28, 2008 at 4:19 PM, <aw...@apache.org> wrote:

> Author: awhite
> Date: Wed May 28 14:19:47 2008
> New Revision: 661090
>
> URL: http://svn.apache.org/viewvc?rev=661090&view=rev
> Log:
> Change default return value of AbstractVersionStrategy.checkVersion to
> something that will force an update on refresh, but won't result in an
> optimistic exception on flush.  This is a more appropriate default for
> derived strategies that don't override cehckVersion (currently only the
> NoneVersionStrategy of the builtins).
>
>
> Modified:
>
>  openjpa/branches/1.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java
>
> Modified:
> openjpa/branches/1.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java
> URL:
> http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java?rev=661090&r1=661089&r2=661090&view=diff
>
> ==============================================================================
> ---
> openjpa/branches/1.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java
> (original)
> +++
> openjpa/branches/1.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java
> Wed May 28 14:19:47 2008
> @@ -63,7 +63,7 @@
>     public boolean checkVersion(OpenJPAStateManager sm, JDBCStore store,
>         boolean updateVersion)
>         throws SQLException {
> -        return false;
> +        return !updateVersion;
>     }
>
>     public int compareVersion(Object v1, Object v2) {
>
>
>