|
Lines 725-731
Link Here
|
| 725 |
|
725 |
|
| 726 |
if (java2buzillaOSMap != null && java2buzillaOSMap.containsKey(OS) && opSysAttribute != null && opSysAttribute.getOptionValues() != null) { |
726 |
if (java2buzillaOSMap != null && java2buzillaOSMap.containsKey(OS) && opSysAttribute != null && opSysAttribute.getOptionValues() != null) { |
| 727 |
bugzillaOS = java2buzillaOSMap.get(OS); |
727 |
bugzillaOS = java2buzillaOSMap.get(OS); |
| 728 |
if (!opSysAttribute.getOptionValues().values().contains(bugzillaOS)) { |
728 |
if (opSysAttribute != null && !opSysAttribute.getOptionValues().values().contains(bugzillaOS)) { |
| 729 |
// If the OS we found is not in the list of available |
729 |
// If the OS we found is not in the list of available |
| 730 |
// options, set bugzillaOS |
730 |
// options, set bugzillaOS |
| 731 |
// to null, and just use "other" |
731 |
// to null, and just use "other" |
|
Lines 739-745
Link Here
|
| 739 |
|
739 |
|
| 740 |
if (platform != null && java2buzillaPlatformMap.containsKey(platform)) { |
740 |
if (platform != null && java2buzillaPlatformMap.containsKey(platform)) { |
| 741 |
bugzillaPlatform = java2buzillaPlatformMap.get(platform); |
741 |
bugzillaPlatform = java2buzillaPlatformMap.get(platform); |
| 742 |
if (!platformAttribute.getOptionValues().values().contains(bugzillaPlatform)) { |
742 |
|
|
|
743 |
if (platformAttribute != null && !platformAttribute.getOptionValues().values().contains(bugzillaPlatform)) { |
| 743 |
// If the platform we found is not int the list of available |
744 |
// If the platform we found is not int the list of available |
| 744 |
// optinos, set the |
745 |
// optinos, set the |
| 745 |
// Bugzilla Platform to null, and juse use "other" |
746 |
// Bugzilla Platform to null, and juse use "other" |
|
Lines 752-760
Link Here
|
| 752 |
} |
753 |
} |
| 753 |
|
754 |
|
| 754 |
// Set the OS and the Platform in the model |
755 |
// Set the OS and the Platform in the model |
| 755 |
if (bugzillaOS != null) |
756 |
if (bugzillaOS != null && opSysAttribute != null) |
| 756 |
opSysAttribute.setValue(bugzillaOS); |
757 |
opSysAttribute.setValue(bugzillaOS); |
| 757 |
if (bugzillaPlatform != null) |
758 |
if (bugzillaPlatform != null && platformAttribute != null) |
| 758 |
platformAttribute.setValue(bugzillaPlatform); |
759 |
platformAttribute.setValue(bugzillaPlatform); |
| 759 |
} catch (Exception e) { |
760 |
} catch (Exception e) { |
| 760 |
MylarStatusHandler.fail(e, "could not set platform options", false); |
761 |
MylarStatusHandler.fail(e, "could not set platform options", false); |