You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2021/02/08 14:32:39 UTC
svn commit: r1886323 - in /jackrabbit/oak/branches/1.6: ./ oak-core/
oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
Author: reschke
Date: Mon Feb 8 14:32:38 2021
New Revision: 1886323
URL: http://svn.apache.org/viewvc?rev=1886323&view=rev
Log:
OAK-6048: Java 8 compilation failure in ConfigurationParametersTest.java (merged r1790552 into 1.6)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1790552
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-core:r1790552
Modified: jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java?rev=1886323&r1=1886322&r2=1886323&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java Mon Feb 8 14:32:38 2021
@@ -250,7 +250,7 @@ public class ConfigurationParametersTest
assertEquals(int1000, options.getConfigValue("Int2", 10, null));
assertEquals("1000", options.getConfigValue("Int2", "1000", null));
- assertEquals(1000, options.getConfigValue("Int3", null, null));
+ assertEquals(int1000, options.getConfigValue("Int3", null, null));
assertEquals(int1000, options.getConfigValue("Int3", 10, null));
assertEquals("1000", options.getConfigValue("Int3", "1000", null));
}