You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@opennlp.apache.org by jo...@apache.org on 2013/08/21 14:39:14 UTC

svn commit: r1516147 - /opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java

Author: joern
Date: Wed Aug 21 12:39:14 2013
New Revision: 1516147

URL: http://svn.apache.org/r1516147
Log:
OPENNLP-593 Updated version check to work with 1.5.x and 1.6.x models

Modified:
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java

Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java?rev=1516147&r1=1516146&r2=1516147&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java Wed Aug 21 12:39:14 2013
@@ -406,8 +406,11 @@ public abstract class BaseModel implemen
         // Major and minor version must match, revision might be 
         if (Version.currentVersion().getMajor() != version.getMajor() ||
             Version.currentVersion().getMinor() != version.getMinor()) {
+          //this check allows for the use of models one minor release behind current minor release
+          if(Version.currentVersion().getMajor() == version.getMajor() && (Version.currentVersion().getMinor()-1) != version.getMinor()){
           throw new InvalidFormatException("Model version " + version + " is not supported by this (" 
               + Version.currentVersion() +") version of OpenNLP!");
+          }
         }
         
         // Reject loading a snapshot model with a non-snapshot version