aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2019-02-23 17:35:20 +0300
committerGravatar Vitaly Takmazov2019-02-23 17:51:20 +0300
commit5731cc328d43a7d4f774c7b974acf610dfd3f9f0 (patch)
treeaca82a9078078295052c8565cf24e8785ed097fb
parentdcb9e0837ae783bde773940f3a671c8f9736e0df (diff)
update deps
-rw-r--r--build.gradle2
-rw-r--r--src/main/java/com/juick/service/UserServiceImpl.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle
index d5529a22..20b02033 100644
--- a/build.gradle
+++ b/build.gradle
@@ -161,7 +161,7 @@ dependencies {
runtime 'org.mariadb.jdbc:mariadb-java-client:2.3.0'
runtime 'net.java.dev.jna:jna:5.2.0'
runtime 'net.java.dev.jna:jna-platform:5.2.0'
- runtime 'com.h2database:h2:1.4.196'
+ runtime 'com.h2database:h2:1.4.198'
runtime "commons-fileupload:commons-fileupload:1.4"
compile 'com.github.ooxi:serialized-php-parser:0.5.0'
diff --git a/src/main/java/com/juick/service/UserServiceImpl.java b/src/main/java/com/juick/service/UserServiceImpl.java
index 59f1a7e1..bcfb8dac 100644
--- a/src/main/java/com/juick/service/UserServiceImpl.java
+++ b/src/main/java/com/juick/service/UserServiceImpl.java
@@ -120,7 +120,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
return -1;
}
- int uid = holder.getKey().intValue();
+ int uid = holder.getKeys().size() > 1 ? (int)holder.getKeys().get("id") : holder.getKey().intValue();
getJdbcTemplate().update("INSERT INTO useroptions(user_id) VALUES (?)", uid);
getJdbcTemplate().update("INSERT INTO subscr_users(user_id, suser_id) VALUES (2, ?)", uid);