donaldp 01/03/21 20:56:50
Modified: src/java/org/apache/phoenix/engine/blocks BlockDAG.java
Log:
Removed some cruft
Revision Changes Path
1.3 +3 -28
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/BlockDAG.java
Index: BlockDAG.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/BlockDAG.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BlockDAG.java 2001/03/22 04:51:36 1.2
+++ BlockDAG.java 2001/03/22 04:56:50 1.3
@@ -81,7 +81,9 @@
//roleEntry should NEVER be null as it is checked when
//entry is added to container
final RoleEntry roleEntry = entry.getRoleEntry( role );
- visitDependency( roleEntry.getName(), serviceInfo, visitor );
+ final String dependencyName = roleEntry.getName();
+ final BlockEntry dependency = getBlockEntry( dependencyName );
+ visitBlock( dependencyName, dependency, visitor, true );
}
}
@@ -118,33 +120,6 @@
}
}
}
- }
-
- /**
- * Load a single dependency.
- * Make sure dependency has service that it is supposed to be providing.
- *
- * @param name the name of dependency
- * @param serviceInfo the description of service dependency should provide
- * @return false on unrecoverable failure
- */
- protected void visitDependency( final String name,
- final ServiceInfo serviceInfo,
- final BlockVisitor visitor )
- throws Exception
- {
- final BlockEntry entry = getBlockEntry( name );
-/*
- //make sure that the block offers service it supposed to be providing
- final ServiceInfo[] services = entry.getBlockInfo().getServices();
- if( !BlockUtil.hasMatchingService( services, serviceInfo ) )
- {
- throw new Exception( "Dependency " + name + " does not offer " +
- "service required: " + serviceInfo );
- }
-*/
- //finally try to traverse block
- visitBlock( name, entry, visitor, true );
}
protected void visitBlock( final String name,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
