Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1524] Fix exception when evolutions has errors.

[1375] Update to Junit 4.10
  • Loading branch information...
commit 409365522cdc544b464e7b9a8164d4bfb6ec7cd7 1 parent bc77610
Alexandre Chatiron xael-fry authored pepite committed
2  framework/dependencies.yml
View
@@ -29,7 +29,7 @@ require: &allDependencies
- javax.inject 1.0
- jaxen 1.1
- joda-time 2.1
- - junit 4.8.1
+ - junit 4.10
- jregex 1.2_01
- log4j 1.2.16
- net.sf.ehcache -> ehcache-core 2.4.3
BIN  framework/lib/junit-4.10.jar
View
Binary file not shown
BIN  framework/lib/junit-4.8.1.jar
View
Binary file not shown
2  framework/src/play/db/Evolutions.java
View
@@ -279,7 +279,7 @@ public static synchronized boolean applyScript(boolean runScript) {
SQLException ex = (SQLException) e;
message += " [ERROR:" + ex.getErrorCode() + ", SQLSTATE:" + ex.getSQLState() + "]";
}
- PreparedStatement ps = connection.prepareStatement("update play_evolutions set last_problem = ?1 where id = ?2");
+ PreparedStatement ps = connection.prepareStatement("update play_evolutions set last_problem = ? where id = ?");
ps.setString(1, message);
ps.setInt(2, applying);
ps.execute();
Please sign in to comment.
Something went wrong with that request. Please try again.