aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2012-12-22 00:20:59 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2012-12-22 00:20:59 +0100
commit012b0864e95e120ea57433ab0e719cc6011c7647 (patch)
tree6052e299e368bc1021d0bb16f3bd1046538df8db
parenta63ec924e5440b17434ecc91e84d1419ae39ef2a (diff)
downloadesper-testing-012b0864e95e120ea57433ab0e719cc6011c7647.tar.gz
esper-testing-012b0864e95e120ea57433ab0e719cc6011c7647.tar.bz2
esper-testing-012b0864e95e120ea57433ab0e719cc6011c7647.tar.xz
esper-testing-012b0864e95e120ea57433ab0e719cc6011c7647.zip
o Being more relaxed when validating ssl certificates.
-rw-r--r--src/main/java/io/trygvis/esper/testing/Config.java8
-rw-r--r--src/main/java/io/trygvis/esper/testing/core/TablePoller.java3
2 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/Config.java b/src/main/java/io/trygvis/esper/testing/Config.java
index 225d289..c080a0b 100644
--- a/src/main/java/io/trygvis/esper/testing/Config.java
+++ b/src/main/java/io/trygvis/esper/testing/Config.java
@@ -59,6 +59,8 @@ public class Config {
}
public static Config loadFromDisk() throws IOException {
+ initSystemProperties();
+
initLogging();
Properties properties = new Properties();
@@ -74,6 +76,12 @@ public class Config {
trimToNull(properties.getProperty("database.password")));
}
+ private static void initSystemProperties() {
+ // Java 7 is more strict on checking matching host names or something similar.
+ // http://docs.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.html#Customization
+ System.setProperty("jsse.enableSNIExtension", "false");
+ }
+
private static void initLogging() {
LoggerFactory.getILoggerFactory();
// LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
diff --git a/src/main/java/io/trygvis/esper/testing/core/TablePoller.java b/src/main/java/io/trygvis/esper/testing/core/TablePoller.java
index a5e5d80..c21b5ae 100644
--- a/src/main/java/io/trygvis/esper/testing/core/TablePoller.java
+++ b/src/main/java/io/trygvis/esper/testing/core/TablePoller.java
@@ -2,7 +2,6 @@ package io.trygvis.esper.testing.core;
import fj.data.*;
import io.trygvis.esper.testing.sql.*;
-import org.joda.time.format.*;
import org.slf4j.*;
import javax.sql.*;
@@ -14,8 +13,6 @@ import static java.lang.System.*;
public class TablePoller<A> {
- private static final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
-
private final Logger logger = LoggerFactory.getLogger(getClass());
private final String pollerName;
private final String tableName;