Author: saces
Date: 2009-04-23 11:57:22 +0000 (Thu, 23 Apr 2009)
New Revision: 27253
Modified:
trunk/freenet/src/freenet/client/async/BaseManifestPutter.java
Log:
remove 'unreachable' code
Modified: trunk/freenet/src/freenet/client/async/BaseManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BaseManifestPutter.java
2009-04-23 11:18:05 UTC (rev 27252)
+++ trunk/freenet/src/freenet/client/async/BaseManifestPutter.java
2009-04-23 11:57:22 UTC (rev 27253)
@@ -372,35 +372,12 @@
}
metadata = m;
- if (parentPutHandler != null) {
- // it is a subcontainer/archive, but not the
root container
-
perContainerPutHandlersWaitingForMetadata.get(parentPutHandler).remove(this);
- HashMap<String, Object> hm =
putHandlersTransformMap.get(this);
- hm.put(name, m);
- putHandlersTransformMap.remove(this);
- try {
-
maybeStartParentContainer(parentPutHandler, container, context);
- } catch (InsertException e) {
- fail(new
InsertException(InsertException.INTERNAL_ERROR, e, null), container, context);
- }
- return;
+ if (isContainer) {
+ // containers are inserted with
reportMetadataOnly=false,
+ // so it can never reach here
+ throw new IllegalStateException();
}
- if (this==rootContainerPutHandler) {
- baseMetadata = m;
- resolveAndStartBase(container, context);
- return;
- }
-
- if (containerMode) {
- try {
-
rootContainerPutHandler.start(container, context);
- } catch (InsertException e) {
- fail(new
InsertException(InsertException.INTERNAL_ERROR, e, null), container, context);
- }
- return;
- }
-
if(persistent) {
container.activate(BaseManifestPutter.this, 1);
container.activate(putHandlersWaitingForMetadata, 2);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
