Context.java (eucalyptus-4.4.1) | : | Context.java (eucalyptus-4.4.2) | ||
---|---|---|---|---|
skipping to change at line 85 | skipping to change at line 85 | |||
import java.net.InetAddress; | import java.net.InetAddress; | |||
import java.net.InetSocketAddress; | import java.net.InetSocketAddress; | |||
import java.util.Collections; | import java.util.Collections; | |||
import java.util.Map; | import java.util.Map; | |||
import java.util.UUID; | import java.util.UUID; | |||
import javax.annotation.Nullable; | import javax.annotation.Nullable; | |||
import javax.security.auth.Subject; | import javax.security.auth.Subject; | |||
import org.apache.log4j.Logger; | import org.apache.log4j.Logger; | |||
import org.jboss.netty.channel.Channel; | import org.jboss.netty.channel.Channel; | |||
import org.jboss.netty.channel.Channels; | import org.jboss.netty.channel.Channels; | |||
import org.jboss.netty.channel.SimpleChannelHandler; | ||||
import org.jboss.netty.channel.local.DefaultLocalClientChannelFactory; | import org.jboss.netty.channel.local.DefaultLocalClientChannelFactory; | |||
import org.jboss.netty.handler.codec.http.HttpMethod; | import org.jboss.netty.handler.codec.http.HttpMethod; | |||
import org.jboss.netty.handler.codec.http.HttpVersion; | import org.jboss.netty.handler.codec.http.HttpVersion; | |||
import com.eucalyptus.auth.Accounts; | import com.eucalyptus.auth.Accounts; | |||
import com.eucalyptus.auth.AuthException; | import com.eucalyptus.auth.AuthException; | |||
import com.eucalyptus.auth.Contract; | import com.eucalyptus.auth.Contract; | |||
import com.eucalyptus.auth.Permissions; | import com.eucalyptus.auth.Permissions; | |||
import com.eucalyptus.auth.principal.Principals; | import com.eucalyptus.auth.principal.Principals; | |||
import com.eucalyptus.auth.principal.UserFullName; | import com.eucalyptus.auth.principal.UserFullName; | |||
import com.eucalyptus.http.MappingHttpRequest; | import com.eucalyptus.http.MappingHttpRequest; | |||
skipping to change at line 133 | skipping to change at line 134 | |||
protected Context( String dest, final BaseMessage msg ) { | protected Context( String dest, final BaseMessage msg ) { | |||
this.correlationId = msg.getCorrelationId( ); | this.correlationId = msg.getCorrelationId( ); | |||
this.creationTime = System.nanoTime(); | this.creationTime = System.nanoTime(); | |||
this.httpRequest = new MappingHttpRequest( HttpVersion.HTTP_1_1, HttpMethod. GET, dest ) { | this.httpRequest = new MappingHttpRequest( HttpVersion.HTTP_1_1, HttpMethod. GET, dest ) { | |||
{ | { | |||
this.setCorrelationId( msg.getCorrelationId( ) ); | this.setCorrelationId( msg.getCorrelationId( ) ); | |||
this.message = msg; | this.message = msg; | |||
} | } | |||
}; | }; | |||
this.channel = new DefaultLocalClientChannelFactory( ).newChannel( Channels. pipeline( ) ); | this.channel = new DefaultLocalClientChannelFactory( ).newChannel( Channels. pipeline( new SimpleChannelHandler( ) ) ); | |||
this.channelManaged = true; | this.channelManaged = true; | |||
this.user = Principals.systemUser( ); | this.user = Principals.systemUser( ); | |||
EventRecord.caller( Context.class, EventType.CONTEXT_CREATE, this.correlatio nId, this.channel.toString( ) ).debug( ); | EventRecord.caller( Context.class, EventType.CONTEXT_CREATE, this.correlatio nId, this.channel.toString( ) ).debug( ); | |||
} | } | |||
protected Context( MappingHttpRequest httpRequest, Channel channel ) { | protected Context( MappingHttpRequest httpRequest, Channel channel ) { | |||
UUID uuid = UUID.randomUUID( ); | UUID uuid = UUID.randomUUID( ); | |||
MessageStatistics.startRequest(channel); | MessageStatistics.startRequest(channel); | |||
this.correlationId = uuid.toString( ); | this.correlationId = uuid.toString( ); | |||
this.creationTime = System.nanoTime(); | this.creationTime = System.nanoTime(); | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added |