@@ -116,10 +116,10 @@
       # If we are running on the Server Hyper-V release, do not install
       # the Java Web plugins.
       #
-      if $java::params::editionID == 'ServerHyperV' {
+      if 'ServerHyper' in $java::params::editionInfo {
         $web_java = 'WEB_JAVA=0'
       } else {
-        $web_java = ''
+        $web_java = 'WEB_JAVA=1'
       }
 
       exec { 'install_jre':
 
@@ -138,12 +138,10 @@
       #
       # We do not want Java to install the WEB plugins on installed on the 
       # Server Hyper-V release of Windows Server.  Collect the Windows Edition
-      # from the registry so we can detect which flaver of Windows were are
-      # running on.
+      # from the registry so init.pp can decide if the Web plugins should
+      # be installed.
       #
       $editionInfo = inline_template("<%= `reg.exe query \"HKLM\\\\SOFTWARE\\\\Microsoft\\\\Windows NT\\\\CurrentVersion\" /v EditionID` -%>")
-      $rawData = split($edID, ' +')
-      $editionID = $rawData[4]
 
       $systemdrive = inline_template("<%= ENV['SystemDrive'] -%>")
Original file line number	Diff line number	Diff line change
`@@ -116,10 +116,10 @@`
`116`	`116`	`# If we are running on the Server Hyper-V release, do not install`
`117`	`117`	`# the Java Web plugins.`
`118`	`118`	`#`
`119`		`- if $java::params::editionID == 'ServerHyperV' {`
	`119`	`+ if 'ServerHyper' in $java::params::editionInfo {`
`120`	`120`	`$web_java = 'WEB_JAVA=0'`
`121`	`121`	`} else {`
`122`		`- $web_java = ''`
	`122`	`+ $web_java = 'WEB_JAVA=1'`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`exec { 'install_jre':`
Original file line number	Diff line number	Diff line change
`@@ -138,12 +138,10 @@`
`138`	`138`	`#`
`139`	`139`	`# We do not want Java to install the WEB plugins on installed on the`
`140`	`140`	`# Server Hyper-V release of Windows Server. Collect the Windows Edition`
`141`		`- # from the registry so we can detect which flaver of Windows were are`
`142`		`- # running on.`
	`141`	`+ # from the registry so init.pp can decide if the Web plugins should`
	`142`	`+ # be installed.`
`143`	`143`	`#`
`144`	`144`	$editionInfo = inline_template("<%= `reg.exe query \"HKLM\\\\SOFTWARE\\\\Microsoft\\\\Windows NT\\\\CurrentVersion\" /v EditionID` -%>")
`145`		`- $rawData = split($edID, ' +')`
`146`		`- $editionID = $rawData[4]`
`147`	`145`
`148`	`146`	`$systemdrive = inline_template("<%= ENV['SystemDrive'] -%>")`
`149`	`147`