Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Jetty 7 is JDK5+ (downgrading improper compiler setting)

This commit is contained in:
Joakim Erdfelt 2012-02-03 14:55:33 -07:00
parent 6c794e68b1
commit 29936f4889
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-nosql/pom.xml
View File

@ -13,6 +13,7 @@
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
<plugins> <plugins>
<!-- Jetty 7 is JDK5 +
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
@ -21,6 +22,7 @@
<verbose>false</verbose> <verbose>false</verbose>
</configuration> </configuration>
</plugin> </plugin>
-->
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>

6
jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java
View File

@ -429,7 +429,6 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
/** /**
* is the session id known to mongo, and is it valid * is the session id known to mongo, and is it valid
*/ */
@Override
public boolean idInUse(String sessionId) public boolean idInUse(String sessionId)
{ {
/* /*
@ -453,7 +452,6 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@Override
public void addSession(HttpSession session) public void addSession(HttpSession session)
{ {
if (session == null) if (session == null)
@ -475,7 +473,6 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@Override
public void removeSession(HttpSession session) public void removeSession(HttpSession session)
{ {
if (session == null) if (session == null)
@ -490,7 +487,6 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@Override
public void invalidateAll(String sessionId) public void invalidateAll(String sessionId)
{ {
synchronized (_sessionsIds) synchronized (_sessionsIds)
@ -519,7 +515,6 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
// TODO not sure if this is correct // TODO not sure if this is correct
@Override
public String getClusterId(String nodeId) public String getClusterId(String nodeId)
{ {
int dot=nodeId.lastIndexOf('.'); int dot=nodeId.lastIndexOf('.');
@ -528,7 +523,6 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
// TODO not sure if this is correct // TODO not sure if this is correct
@Override
public String getNodeId(String clusterId, HttpServletRequest request) public String getNodeId(String clusterId, HttpServletRequest request)
{ {
if (_workerName!=null) if (_workerName!=null)