Merge pull request #911 from tronprotocol/p2p

p2p: bean import problem

Author: lvs007

src/main/java/org/tron/common/overlay/server/SyncPool.java

@@ -64,6 +64,8 @@ public class SyncPool {
   private NodeManager nodeManager;
 
   @Autowired
+  private ApplicationContext ctx;
+
   private ChannelManager channelManager;
 
   private PeerConnectionDelegate peerDel;
@@ -86,6 +88,8 @@ public SyncPool(PeerClient peerClient) {
   public void init(PeerConnectionDelegate peerDel) {
     this.peerDel = peerDel;
 
+    channelManager = ctx.getBean(ChannelManager.class);
+
     poolLoopExecutor.scheduleWithFixedDelay(() -> {
       try {
         fillUp();

src/main/java/org/tron/program/FullNode.java

@@ -1,6 +1,7 @@
 package org.tron.program;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.tron.common.application.Application;
@@ -27,7 +28,11 @@ public static void main(String[] args) throws InterruptedException {
       return;
     }
 
-    ApplicationContext context = new AnnotationConfigApplicationContext(DefaultConfig.class);
+    DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+    beanFactory.setAllowCircularReferences(false);
+    AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(beanFactory);
+    context.register(DefaultConfig.class);
+    context.refresh();
     Application appT = ApplicationFactory.create(context);
     shutdown(appT);
     //appT.init(cfgArgs);