Update of /cvsroot/freenet/freenet/src/freenet/node/ds
In directory sc8-pr-cvs1:/tmp/cvs-serv644/src/freenet/node/ds
Modified Files:
FSDataStoreElement.java
Log Message:
Fix all Core.logger.{DEBUG,etc} uses to be Logger.{DEBUG,etc}. Kills tons of eclipse
warnings, total down to 872 now (started a little under 2300).
Index: FSDataStoreElement.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/ds/FSDataStoreElement.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -w -r1.37 -r1.38
--- FSDataStoreElement.java 21 Oct 2003 01:52:36 -0000 1.37
+++ FSDataStoreElement.java 31 Oct 2003 18:13:14 -0000 1.38
@@ -2,6 +2,7 @@
import freenet.*;
import freenet.fs.dir.*;
+import freenet.support.Logger;
import freenet.support.io.*;
import java.io.*;
@@ -30,8 +31,8 @@
this.key = key;
this.buffer = buffer;
this.physLen = physLen;
- if(Core.logger.shouldLog(Core.logger.DEBUG))
- Core.logger.log(this,"FSDataStoreElement initializing: " + key.toString() +
":"+physLen,Core.logger.DEBUG);
+ if(Core.logger.shouldLog(Logger.DEBUG))
+ Core.logger.log(this,"FSDataStoreElement initializing: " + key.toString() +
":"+physLen,Logger.DEBUG);
}
public final String toString() {
@@ -67,13 +68,13 @@
}
synchronized final void release() {
- boolean logDEBUG = Core.logger.shouldLog(Core.logger.DEBUG);
+ boolean logDEBUG = Core.logger.shouldLog(Logger.DEBUG);
if(logDEBUG) Core.logger.log(this, "release(): "+users+" still waiting for "+
- this, Core.logger.DEBUG);
+ this, Logger.DEBUG);
if (--users == 0) {
buffer.release();
if(logDEBUG) Core.logger.log(this, "Releasing underlying buffer for "+this,
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
}
@@ -118,7 +119,7 @@
Core.logger.log(this, "Wrote: " + bytesWritten
+ " of " +
buffer.length() + " (or " +
- physLen + ") for "+this, Core.logger.MINOR);
+ physLen + ") for "+this, Logger.MINOR);
rollback = true;
}
out.close();
@@ -153,14 +154,14 @@
synchronized (FSDataStoreElement.this) {
try {
Core.logger.log(this, "committing key: "+key,
- Core.logger.DEBUG);
+ Logger.DEBUG);
synchronized (ds.dir.semaphore()) {
if (ds.dir.contains(new FileNumber(key.getVal()))) {
commit = true;
setFailureCode(Presentation.CB_CANCELLED);
Core.logger.log(this, "collision: "+key,
- Core.logger.DEBUG);
+ Logger.DEBUG);
throw new KeyCollisionException();
}
buffer.commit();
@@ -174,7 +175,7 @@
setFailureCode(Presentation.CB_CACHE_FAILED);
Core.logger.log(this,
"failed to store key: "+key,
- Core.logger.ERROR);
+ Logger.ERROR);
}
}
}
@@ -192,9 +193,9 @@
}
public final void fail(int code) {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Failing "+key, new Exception
- ("failing"), Core.logger.DEBUG);
+ ("failing"), Logger.DEBUG);
rollback();
setFailureCode(code);
}
@@ -208,7 +209,7 @@
if (!closed) {
Core.logger.log(this,
"FSDataStoreElement not closed in finalizer! - please
report to [EMAIL PROTECTED] if this happens frequently: "+
- this, Core.logger.ERROR);
+ this, Logger.ERROR);
if (!commit && !rollback) {
rollback = true;
}
@@ -233,7 +234,7 @@
private long read = 0;
public KeyInputStreamImpl() throws IOException {
- Core.logger.log(this,"KeyInputStreamImpl initializing",Core.logger.DEBUG);
+ Core.logger.log(this,"KeyInputStreamImpl initializing",Logger.DEBUG);
InputStream oin = buffer.getInputStream();
if(oin == null) throw new IllegalStateException
("null stream from buffer "+buffer);
@@ -246,14 +247,14 @@
} catch (IOException e) {
in.close();
closed = true;
- Core.logger.log(this, "IOException parsing fields", Core.logger.ERROR);
+ Core.logger.log(this, "IOException parsing fields", Logger.ERROR);
throw e;
}
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this,"Read " + cin.count() + " into fields in "+key+",
"+this,new Exception("debug"),
- Core.logger.DEBUG);
+ Logger.DEBUG);
length = buffer.length() - cin.count();
- Core.logger.log(this,"Remaining: " + length + " bytes in
"+key+".",Core.logger.DEBUG);
+ Core.logger.log(this,"Remaining: " + length + " bytes in
"+key+".",Logger.DEBUG);
if (length < 0) throw new IllegalStateException
("negative bytes remaining");
++users;
@@ -332,15 +333,15 @@
Core.logger.log(this,
"Please close() me manually in finalizer: "+
this, new IllegalStateException("unclosed"),
- Core.logger.ERROR);
+ Logger.ERROR);
// Debug
Core.logger.log(this, "Message = " + message,
- Core.logger.DEBUG);
+ Logger.DEBUG);
if (mh != null)
mh.printChainInfo(id, Core.logStream);
else
- Core.logger.log(this,"No info", Core.logger.DEBUG);
+ Core.logger.log(this,"No info", Logger.DEBUG);
// end debug
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
