Skip to content

Commit

Permalink
Merge pull request #72 from Atmosphere/nettosphere-2.1.x
Browse files Browse the repository at this point in the history 
Nettosphere 2.1.x
  • Loading branch information
@jfarcand
jfarcand committed Mar 5, 2014
2 parents 2a220ff + 69cb316 commit c8fa294
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 47 deletions.
96 changes: 50 additions & 46 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,53 +189,57 @@
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
<configuration>
<aggregate>true</aggregate>
<source>1.6</source>
<encoding>UTF-8</encoding>
<maxmemory>1g</maxmemory>
<links>
<link>http://java.sun.com/javase/6/docs/api/</link>
</links>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>verify</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>release-profile</id>
<properties>
<skipTests>true</skipTests>
</properties>
<build>
<plugins>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.5</version>
<configuration>
<aggregate>true</aggregate>
<source>1.6</source>
<encoding>UTF-8</encoding>
<maxmemory>1g</maxmemory>
<links>
<link>http://java.sun.com/javase/6/docs/api/</link>
</links>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>verify</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<reporting>
<outputDirectory>target/site</outputDirectory>
<plugins>
Expand Down Expand Up @@ -300,7 +304,7 @@
<surefire.redirectTestOutputToFile>false</surefire.redirectTestOutputToFile>
<source.property>1.6</source.property>
<target.property>1.6</target.property>
<atmosphere.version>2.1.0</atmosphere.version>
<atmosphere.version>2.1.1-SNAPSHOT</atmosphere.version>
</properties>
</project>

2 changes: 1 addition & 1 deletion server/src/main/java/org/atmosphere/nettosphere/HttpStaticFileServerHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Ex
sendError(ctx, NOT_FOUND, e);
return;
}
request.addHeader(SERVICED, "true");

// Cache Validation
String ifModifiedSince = request.getHeader(IF_MODIFIED_SINCE);
Expand Down Expand Up @@ -240,7 +241,6 @@ public void operationProgressed(
// Close the connection when the whole content is written out.
writeFuture.addListener(ChannelFutureListener.CLOSE);
}
request.addHeader(SERVICED, "true");
}

@Override
Expand Down

0 comments on commit c8fa294

Please sign in to comment.