Compare commits

11 Commits

Author SHA1 Message Date
9d430dbb75 Merge pull request #3 from informatik-ag-ngl/b/cancelled_socket
Fixed unresponsive behavior after cancelled socket
2020-02-09 15:34:35 +01:00
6c3ceaae36 Printing socket exception to console 2020-02-09 15:16:59 +01:00
028399a3e6 Closing socket if MessageReader fails 2020-02-09 15:09:00 +01:00
5cf2959e1a Fixed consecutive message writing 2020-01-11 10:53:01 +01:00
27ac6b43c0 Generating sources and Javadoc in JAR export 2020-01-06 14:38:14 +01:00
0044e5c200 Fixed Maven build error caused by release flag 2020-01-06 10:29:21 +01:00
35bce6dae7 Added getters for SocketAcceptor and SocketProcessor to Server 2020-01-03 17:55:37 +02:00
ef44963f20 Merge branch 'master' of https://github.com/informatik-ag-ngl/java-nio-server.git 2020-01-03 17:19:50 +02:00
282f9b916a Added listener mechanism for socket registration and cancellation 2020-01-03 17:19:40 +02:00
aedb2a9ac0 Create maven.yml
Maven build is done automatically on push
2019-12-30 15:28:51 +01:00
6b9a4d4f1c Merge pull request #1 from informatik-ag-ngl/f/style_adjustment
Converted to Maven project, reformatted source files and added Javadoc headers
2019-12-28 11:50:57 +02:00
6 changed files with 10 additions and 29 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>

View File

@ -9,9 +9,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Set up JDK 11 - name: Set up JDK 1.8
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 11 java-version: 1.8
- name: Build with Maven - name: Build with Maven
run: mvn -B package --file pom.xml run: mvn -B package --file pom.xml

View File

@ -1,8 +1,8 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.compiler.source=1.8

15
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>informatik-ag-ngl</groupId> <groupId>informatik-ag-ngl</groupId>
<artifactId>java-nio-server</artifactId> <artifactId>java-nio-server</artifactId>
<version>0.1-beta</version> <version>0.0.1-SNAPSHOT</version>
<name>java-nio-server</name> <name>java-nio-server</name>
<url>https://github.com/informatik-ag-ngl/java-nio-server</url> <url>https://github.com/informatik-ag-ngl/java-nio-server</url>
@ -13,8 +13,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
</properties> </properties>
<dependencies> <dependencies>
@ -28,15 +28,6 @@
<build> <build>
<finalName>java-nio-server</finalName> <finalName>java-nio-server</finalName>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

View File

@ -67,7 +67,7 @@ public class Message {
while (this.length + remaining > capacity) while (this.length + remaining > capacity)
if (!this.messageBuffer.expandMessage(this)) return -1; if (!this.messageBuffer.expandMessage(this)) return -1;
int bytesToCopy = Math.min(remaining, capacity - this.length); int bytesToCopy = Math.min(remaining, capacity - length);
System.arraycopy(byteArray, offset, sharedArray, this.offset + this.length, bytesToCopy); System.arraycopy(byteArray, offset, sharedArray, this.offset + this.length, bytesToCopy);
this.length += bytesToCopy; this.length += bytesToCopy;
return bytesToCopy; return bytesToCopy;

View File

@ -1,10 +0,0 @@
/**
* Contains the entire server API.
*
* @author Kai S. K. Engelbart
* @since java-nio-server v0.1-beta
*/
module java.nio.server {
exports com.jenkov.nioserver;
}