Revision 380f01e0 src/TopologyManager/cyclon.c

View differences:

src/TopologyManager/cyclon.c
124 124
      local_cache = new;
125 125
    }
126 126
    if (sent_cache) {
127
#if 0
128
      caches_add(local_cache, sent_cache);		/* CACHE UNION??? */
129
#else
130 127
      int dummy;
131 128

  
132 129
      new = cache_union(local_cache, sent_cache, &dummy);
133
      local_cache = new;
134
#endif
130
      if (new != NULL) {
131
        cache_free(local_cache);
132
        local_cache = new;
133
      }
135 134
      cache_free(sent_cache);
136 135
    } else {
137 136
      if (flying_cache) {
......
143 142

  
144 143
  if (time_to_send()) {
145 144
    if (flying_cache) {
146
#if 0
147
      caches_add(local_cache, flying_cache);		/* CACHE UNION??? */
148
#else
149 145
      struct peer_cache *new;
150 146
      int dummy;
147

  
151 148
      new = cache_union(local_cache, flying_cache, &dummy);
152
      local_cache = new;
153
#endif
149
      if (new != NULL) {
150
        cache_free(local_cache);
151
        local_cache = new;
152
      }
154 153
      cache_free(flying_cache);
155 154
      flying_cache = NULL;
156 155
    }

Also available in: Unified diff