aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/java
diff options
context:
space:
mode:
authorhoelzlwimmerf <hoelzlwimmerf@Desktop01.fritz.box>2015-10-21 16:49:17 +0200
committerhoelzlwimmerf <hoelzlwimmerf@Desktop01.fritz.box>2015-10-21 16:49:17 +0200
commit1ea2389061205bf7872a02794f652616ab204a41 (patch)
tree6ba9cc61a942e0dc799d210e169b21a9a8d1de06 /core/src/main/java
parentb1397a17955961e2260172f5abf5ec2f4ba54709 (diff)
downloadnanohttpd-1ea2389061205bf7872a02794f652616ab204a41.tar.gz
Added SSLServerSocketFactoryTest;
Fixed non-static classes and wrong return.
Diffstat (limited to 'core/src/main/java')
-rw-r--r--core/src/main/java/fi/iki/elonen/NanoHTTPD.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
index bf58c7b..2f3c665 100644
--- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
+++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
@@ -478,7 +478,7 @@ public abstract class NanoHTTPD {
/**
* Creates a normal ServerSocket for TCP connections
*/
- public class DefaultServerSocketFactory implements ServerSocketFactory {
+ public static class DefaultServerSocketFactory implements ServerSocketFactory {
@Override
public ServerSocket create() {
@@ -487,7 +487,7 @@ public abstract class NanoHTTPD {
} catch (IOException e) {
e.printStackTrace();
}
- return myServerSocket;
+ return null;
}
}
@@ -495,7 +495,7 @@ public abstract class NanoHTTPD {
/**
* Creates a new SSLServerSocket
*/
- public class SecureServerSocketFactory implements ServerSocketFactory {
+ public static class SecureServerSocketFactory implements ServerSocketFactory {
private SSLServerSocketFactory sslServerSocketFactory;