keycloak-aplcache

Merge pull request #2138 from mposolda/master Fix testsuite …

1/29/2016 12:04:21 PM

with Sybase

Marek Posolda

Commit: 366606e

Tree: 78a3c7b

Parents: 41551e0
f2082d5

Changes

model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.0.xml 18(+9 -9)

server-spi/src/main/java/org/keycloak/models/PasswordPolicy.java 2(+1 -1)

Details

model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.0.xml 18(+9 -9)

diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.0.xml
index 02c1423..80ebdc4 100644
--- a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.0.xml
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.0.xml
@@ -5,41 +5,41 @@
         <!-- This is needed for MSSQL :( -->
         <!-- 1.5 -->
         <update tableName="REALM">
-            <column name="OTP_POLICY_COUNTER" type="INT" value="0" />
+            <column name="OTP_POLICY_COUNTER" type="INT" valueNumeric="0" />
             <where>OTP_POLICY_COUNTER is NULL</where>
         </update>
         <update tableName="REALM">
-            <column name="OTP_POLICY_WINDOW" type="INT" value="1" />
+            <column name="OTP_POLICY_WINDOW" type="INT" valueNumeric="1" />
             <where>OTP_POLICY_WINDOW is NULL</where>
         </update>
         <update tableName="REALM">
-            <column name="OTP_POLICY_PERIOD" type="INT" value="30" />
+            <column name="OTP_POLICY_PERIOD" type="INT" valueNumeric="30" />
             <where>OTP_POLICY_PERIOD is NULL</where>
         </update>
         <update tableName="REALM">
-            <column name="OTP_POLICY_DIGITS" type="INT" value="6" />
+            <column name="OTP_POLICY_DIGITS" type="INT" valueNumeric="6" />
             <where>OTP_POLICY_DIGITS is NULL</where>
         </update>
         <update tableName="CREDENTIAL">
-            <column name="COUNTER" type="INT" value="0" />
+            <column name="COUNTER" type="INT" valueNumeric="0" />
             <where>COUNTER is NULL</where>
         </update>
         <update tableName="CREDENTIAL">
-            <column name="DIGITS" type="INT" value="6" />
+            <column name="DIGITS" type="INT" valueNumeric="6" />
             <where>DIGITS is NULL</where>
         </update>
         <update tableName="CREDENTIAL">
-            <column name="PERIOD" type="INT" value="30" />
+            <column name="PERIOD" type="INT" valueNumeric="30" />
             <where>PERIOD is NULL</where>
         </update>
         <!-- 1.6 -->
         <update tableName="REALM">
-            <column name="OFFLINE_SESSION_IDLE_TIMEOUT" type="INT" value="2592000" />
+            <column name="OFFLINE_SESSION_IDLE_TIMEOUT" type="INT" valueNumeric="2592000" />
             <where>OFFLINE_SESSION_IDLE_TIMEOUT is NULL</where>
         </update>
         <!-- 1.7 -->
         <update tableName="REALM">
-            <column name="ACCESS_TOKEN_LIFE_IMPLICIT" type="INT" value="900" />
+            <column name="ACCESS_TOKEN_LIFE_IMPLICIT" type="INT" valueNumeric="900" />
             <where>ACCESS_TOKEN_LIFE_IMPLICIT is NULL</where>
         </update>

server-spi/src/main/java/org/keycloak/models/PasswordPolicy.java 2(+1 -1)

diff --git a/server-spi/src/main/java/org/keycloak/models/PasswordPolicy.java b/server-spi/src/main/java/org/keycloak/models/PasswordPolicy.java
index a45e9f2..08d8da3 100755
--- a/server-spi/src/main/java/org/keycloak/models/PasswordPolicy.java
+++ b/server-spi/src/main/java/org/keycloak/models/PasswordPolicy.java
@@ -32,7 +32,7 @@ public class PasswordPolicy implements Serializable {
         this.policyString = policyString;
         this.policies = new LinkedList<>();
 
-        if (policyString != null && !policyString.isEmpty()) {
+        if (policyString != null && !policyString.trim().isEmpty()) {
             for (String policy : policyString.split(" and ")) {
                 policy = policy.trim();