← Back to branch summary

~tritone-team/tritone/eucalyptus

« back to all changes in this revision

Viewing changes to clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterState.java

  • Committer: Bazaar Package Importer
  • Author(s): Dustin Kirkland
  • Date: 2009-12-01 21:09:28 UTC
  • mto: This revision was merged to the branch mainline in revision 75.
  • Revision ID: james.westby@ubuntu.com-20091201210928-o2dvg0ubljhb0ft6
Tags: upstream-1.6.1~bzr1083
Import upstream version 1.6.1~bzr1083

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterState.java
98
98
    int max = 4095;
99
99
    try {
100
100
      for( ClusterConfiguration cc : Configuration.getClusterConfigurations( ) ) {
101
 
        min = cc.getMinVlan( ) > min ? cc.getMinVlan( ) : min;
102
 
        max = cc.getMaxVlan( ) < max ? cc.getMaxVlan( ) : max;
 
101
        if(cc.getMinVlan() != null)
 
102
            min = cc.getMinVlan( ) > min ? cc.getMinVlan( ) : min;
 
103
        if(cc.getMaxVlan() != null)
 
104
            max = cc.getMaxVlan( ) < max ? cc.getMaxVlan( ) : max;
103
105
      }
104
106
    } catch ( EucalyptusCloudException e ) {
105
107
      LOG.debug( e, e );