boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

*) Bugfix for ArrayIndexOutOfBoundsExceptions which occure because SimpleDateFormat is not thread-safe

Browse Source 
See: http://www.yacy-forum.de/viewtopic.php?t=2995

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2810 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
theli 19 years ago
parent b357a13e9a
commit 52466067d8
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
htroot/yacy/hello.java
Unescape View File

@ -157,7 +157,7 @@ public final class hello {
yacyCore.peerActions.peerArrival(remoteSeed, true); yacyCore.peerActions.peerArrival(remoteSeed, true);
} else { } else {
prop.put(yacySeed.YOURTYPE, yacySeed.PEERTYPE_JUNIOR); prop.put(yacySeed.YOURTYPE, yacySeed.PEERTYPE_JUNIOR);
remoteSeed.put(yacySeed.LASTSEEN, yacyCore.shortFormatter.format(new Date(System.currentTimeMillis() + serverDate.UTCDiff() - remoteSeed.getUTCDiff())) ); remoteSeed.put(yacySeed.LASTSEEN, yacyCore.universalDateShortString(new Date(System.currentTimeMillis() + serverDate.UTCDiff() - remoteSeed.getUTCDiff())) );
yacyCore.peerActions.juniorConnects++; // update statistics yacyCore.peerActions.juniorConnects++; // update statistics
remoteSeed.put(yacySeed.PEERTYPE, yacySeed.PEERTYPE_JUNIOR); remoteSeed.put(yacySeed.PEERTYPE, yacySeed.PEERTYPE_JUNIOR);
yacyCore.log.logInfo("hello: responded remote junior peer '" + remoteSeed.getName() + "' from " + reportedip); yacyCore.log.logInfo("hello: responded remote junior peer '" + remoteSeed.getName() + "' from " + reportedip);

29
source/de/anomic/yacy/yacyCore.java
Unescape View File

@ -62,6 +62,7 @@ import java.io.FilenameFilter;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URI; import java.net.URI;
import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
@ -121,7 +122,7 @@ public class yacyCore {
private static TimeZone GMTTimeZone = TimeZone.getTimeZone("America/Los_Angeles"); private static TimeZone GMTTimeZone = TimeZone.getTimeZone("America/Los_Angeles");
public static String universalDateShortPattern = "yyyyMMddHHmmss"; public static String universalDateShortPattern = "yyyyMMddHHmmss";
public static SimpleDateFormat shortFormatter = new SimpleDateFormat(universalDateShortPattern); private static SimpleDateFormat shortFormatter = new SimpleDateFormat(universalDateShortPattern);
public static long universalTime() { public static long universalTime() {
return universalDate().getTime(); return universalDate().getTime();
@ -136,14 +137,36 @@ public class yacyCore {
} }
public static String universalDateShortString(Date date) { public static String universalDateShortString(Date date) {
return shortFormatter.format(date); /*
* This synchronized is needed because SimpleDateFormat is not thread-safe.
* See: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6231579
*/
synchronized(yacyCore.shortFormatter) {
return shortFormatter.format(date);
}
}
public static Date parseUniversalDate(String timeString) throws ParseException {
/*
* This synchronized is needed because SimpleDateFormat is not thread-safe.
* See: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6231579
*/
synchronized(yacyCore.shortFormatter) {
return yacyCore.shortFormatter.parse(timeString);
}
} }
public static Date parseUniversalDate(String remoteTimeString, String remoteUTCOffset) { public static Date parseUniversalDate(String remoteTimeString, String remoteUTCOffset) {
if (remoteTimeString == null || remoteTimeString.length() == 0) { return new Date(); } if (remoteTimeString == null || remoteTimeString.length() == 0) { return new Date(); }
if (remoteUTCOffset == null || remoteUTCOffset.length() == 0) { return new Date(); } if (remoteUTCOffset == null || remoteUTCOffset.length() == 0) { return new Date(); }
try { try {
return new Date(yacyCore.shortFormatter.parse(remoteTimeString).getTime() - serverDate.UTCDiff() + serverDate.UTCDiff(remoteUTCOffset)); /*
* This synchronized is needed because SimpleDateFormat is not thread-safe.
* See: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6231579
*/
synchronized(yacyCore.shortFormatter) {
return new Date(yacyCore.shortFormatter.parse(remoteTimeString).getTime() - serverDate.UTCDiff() + serverDate.UTCDiff(remoteUTCOffset));
}
} catch (java.text.ParseException e) { } catch (java.text.ParseException e) {
log.logFinest("parseUniversalDate " + e.getMessage() + ", remoteTimeString=[" + remoteTimeString + "]"); log.logFinest("parseUniversalDate " + e.getMessage() + ", remoteTimeString=[" + remoteTimeString + "]");
return new Date(); return new Date();

4
source/de/anomic/yacy/yacyPeerActions.java
Unescape View File

@ -325,7 +325,7 @@ public class yacyPeerActions {
dtimeUTC0 = 0; // never disconnected: virtually disconnected maximum time ago dtimeUTC0 = 0; // never disconnected: virtually disconnected maximum time ago
} else { } else {
try { try {
dtimeUTC0 = yacyCore.shortFormatter.parse(disconnectedSeed.get("disconnected", "20040101000000")).getTime() - seed.getUTCDiff(); dtimeUTC0 = yacyCore.parseUniversalDate(disconnectedSeed.get("disconnected", "20040101000000")).getTime() - seed.getUTCDiff();
} catch (java.text.ParseException e) { } catch (java.text.ParseException e) {
dtimeUTC0 = 0; dtimeUTC0 = 0;
} }
@ -371,7 +371,7 @@ public class yacyPeerActions {
try { try {
// if the old LastSeen date is later then the other // if the old LastSeen date is later then the other
// info, then we reject the info // info, then we reject the info
if ((ctimeUTC0 < (yacyCore.shortFormatter.parse(connectedSeed.get(yacySeed.LASTSEEN, "20040101000000")).getTime() - connectedSeed.getUTCDiff() + serverDate.UTCDiff())) && (!(direct))) { if ((ctimeUTC0 < (yacyCore.parseUniversalDate(connectedSeed.get(yacySeed.LASTSEEN, "20040101000000")).getTime() - connectedSeed.getUTCDiff() + serverDate.UTCDiff())) && (!(direct))) {
yacyCore.log.logFine("connect: rejecting old info about peer '" + seed.getName() + "'"); yacyCore.log.logFine("connect: rejecting old info about peer '" + seed.getName() + "'");
return false; return false;
} }

8
source/de/anomic/yacy/yacySeed.java
Unescape View File

@ -270,7 +270,7 @@ public class yacySeed {
public final void setJunior() { put(yacySeed.PEERTYPE, yacySeed.PEERTYPE_JUNIOR); } public final void setJunior() { put(yacySeed.PEERTYPE, yacySeed.PEERTYPE_JUNIOR); }
public final void setSenior() { put(yacySeed.PEERTYPE, yacySeed.PEERTYPE_SENIOR); } public final void setSenior() { put(yacySeed.PEERTYPE, yacySeed.PEERTYPE_SENIOR); }
public final void setPrincipal() { put(yacySeed.PEERTYPE, yacySeed.PEERTYPE_PRINCIPAL); } public final void setPrincipal() { put(yacySeed.PEERTYPE, yacySeed.PEERTYPE_PRINCIPAL); }
public final void setLastSeen() { put(yacySeed.LASTSEEN, yacyCore.shortFormatter.format(new Date(System.currentTimeMillis() + serverDate.UTCDiff() - getUTCDiff()))); } public final void setLastSeen() { put(yacySeed.LASTSEEN, yacyCore.universalDateShortString(new Date(System.currentTimeMillis() + serverDate.UTCDiff() - getUTCDiff()))); }
public final void put(String key, String value) { public final void put(String key, String value) {
synchronized (this.dna) { synchronized (this.dna) {
@ -367,7 +367,7 @@ public class yacySeed {
public final long getLastSeenTime() { public final long getLastSeenTime() {
try { try {
final long t = yacyCore.shortFormatter.parse(get(yacySeed.LASTSEEN, "20040101000000")).getTime(); final long t = yacyCore.parseUniversalDate(get(yacySeed.LASTSEEN, "20040101000000")).getTime();
// the problem here is: getTime applies a time shift according to local time zone: // the problem here is: getTime applies a time shift according to local time zone:
// it substracts the local UTF offset, but it should subtract the remote UTC offset // it substracts the local UTF offset, but it should subtract the remote UTC offset
// so we correct it by first adding the local UTF offset and then subtracting the remote // so we correct it by first adding the local UTF offset and then subtracting the remote
@ -384,7 +384,7 @@ public class yacySeed {
public final int getAge() { public final int getAge() {
// returns the age as number of days // returns the age as number of days
try { try {
final long t = yacyCore.shortFormatter.parse(get(yacySeed.BDATE, "20040101000000")).getTime(); final long t = yacyCore.parseUniversalDate(get(yacySeed.BDATE, "20040101000000")).getTime();
return (int) ((System.currentTimeMillis() - (t - getUTCDiff() + serverDate.UTCDiff())) / 1000 / 60 / 60 / 24); return (int) ((System.currentTimeMillis() - (t - getUTCDiff() + serverDate.UTCDiff())) / 1000 / 60 / 60 / 24);
} catch (java.text.ParseException e) { } catch (java.text.ParseException e) {
return -1; return -1;
@ -395,7 +395,7 @@ public class yacySeed {
public final void setLastSeenTime() { public final void setLastSeenTime() {
// if we set a last seen time, then we need to respect the seeds UTC offset // if we set a last seen time, then we need to respect the seeds UTC offset
put(yacySeed.LASTSEEN, yacyCore.shortFormatter.format(new Date(System.currentTimeMillis() - serverDate.UTCDiff() + getUTCDiff()))); put(yacySeed.LASTSEEN, yacyCore.universalDateShortString(new Date(System.currentTimeMillis() - serverDate.UTCDiff() + getUTCDiff())));
} }
public void setPeerTags(Set keys) { public void setPeerTags(Set keys) {

Write Preview
Loading…
Cancel
Save