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

Fixing javadoc errors preventing release

This commit is contained in:
Joakim Erdfelt 2015-05-22 16:36:31 -07:00
parent 1925867757
commit c25772e147
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,8 +241,8 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
/**
* Check a block of session ids for expiry and thus scavenge.
*
* @param atTime
* @param ids
* @param atTime purge at time
* @param ids set of session ids
*/
protected void scavengeBlock (long atTime, Set<String> ids)
{
@ -413,7 +413,7 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
/* ------------------------------------------------------------ */
/** When scavenging, the max number of session ids in the query.
*
* @param size
* @param size the scavenge block size
*/
public void setScavengeBlockSize (int size)
{
@ -421,9 +421,6 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
}
/* ------------------------------------------------------------ */
/**
* @return
*/
public int getScavengeBlockSize ()
{
return _scavengeBlockSize;
@ -432,7 +429,9 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
/* ------------------------------------------------------------ */
/**
* The maximum number of items to return from a purge query. If <= 0 there is no limit. Defaults to 0
* The maximum number of items to return from a purge query. If &lt;= 0 there is no limit. Defaults to 0
*
* @param purgeLimit the purge limit
*/
public void setPurgeLimit(int purgeLimit)
{

18
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaInfConfiguration.java
View File

@ -350,18 +350,18 @@ public class MetaInfConfiguration extends AbstractConfiguration
/**
* Find all .tld files in all subdirs of the given dir.
*
* @param file
* @return
* @throws IOException
* @param dir the directory to scan
* @return the list of tlds found
* @throws IOException if unable to scan the directory
*/
public Collection<URL> getTlds (File file) throws IOException
public Collection<URL> getTlds (File dir) throws IOException
{
if (file == null || !file.isDirectory())
if (dir == null || !dir.isDirectory())
return Collections.emptySet();
HashSet<URL> tlds = new HashSet<URL>();
File[] files = file.listFiles();
File[] files = dir.listFiles();
if (files != null)
{
for (File f:files)
@ -382,9 +382,9 @@ public class MetaInfConfiguration extends AbstractConfiguration
/**
* Find all .tld files in the given jar.
*
* @param uri
* @return
* @throws IOException
* @param uri the uri to jar file
* @return the collection of tlds as url references
* @throws IOException if unable to scan the jar file
*/
public Collection<URL> getTlds (URI uri) throws IOException
{

1
tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractOrphanedSessionTest.java
View File

@ -46,6 +46,7 @@ public abstract class AbstractOrphanedSessionTest
/**
* If nodeA creates a session, and just afterwards crashes, it is the only node that knows about the session.
* We want to test that the session data is gone after scavenging.
* @throws Exception on test failure
*/
@Test
public void testOrphanedSession() throws Exception